Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Update issue tracker links in comments, from Tigris (issuezilla) to Apache (Jira).

URL fragment identifiers like '#desc5' are left in place, not yet updated.

This is a merge of r1828508 from the 'shelve-checkpoint' branch where I

committed it by mistake.

  1. … 43 more files in changeset.
Teach the JavaHL tests to optionally clean up after themselves

when given the JAVAHL_CLEAN option on the make command line

(or with the system property test.cleanup set to a non-empty string).

* Makefile.in

(check-tigris-javahl, check-apache-javahl, check-deprecated-authn-javahl):

Define the test.cleanup property when running JavaHL tests.

[in subversion/bindings/javahl/tests]

* org/apache/subversion/javahl/SVNTests.java

(SVNTest.cleanupAfterTests, SVNTest.testDirs): New fields.

(SVNTest.init): Initialize SVNTest.cleanupAfterTests from properties.

(SVNTest.tearDown): Optionally remove test directories.

(SVNTest.trackDir): New.

(SVNTest.OneTest.createInitialRepository,

SVNTest.OneTest.createInitialWorkingCopy): Track created directories.

* org/apache/subversion/javahl/SVNRemoteTests.java,

* org/apache/subversion/javahl/SVNReposTests.java,

* org/tigris/subversion/javahl/SVNAdminTests.java:

(<test-class>.testName): Declare the base name for test directories.

(<test-class>.<init>): Call init().

(<test-class>.init): Initialize the global test name.

  1. … 4 more files in changeset.
Following up on r1655637, fill even more svn_client_commit_item3_t fields

and apply some updated expected results in JavaHL.

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

(testJNIError,

testBasicMkdirUrl): Expect creation of directory when using mkdir URL.

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java

(setUp): Expect import to provide a url and kind.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java

(setUp): Expect import to provide a url and kind.

* subversion/libsvn_client/import.c

(svn_client_import5): Provide kind an url in commit item.

* subversion/libsvn_client/util.c

(svn_client_commit_item3_create): Use svn_node_unknown as default kind.

  1. … 4 more files in changeset.
Add extra JNI checking to JavaHL test runs.

This really should have been enabled since forever.

* Makefile.in

(check-tigris-javahl, check-apache-javahl, check-deprecated-authn-javahl):

Add the -Xcheck:jni option to the JVM parameters.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(BasicTests.CountingProgressListener): New; similar to equivalent class

in the org.apache... test suite.

(BasicTests.testDataTransferProgressReport): Do not use an exception to

notice that progress has been reported. This avoids an otherwise trivial

warning by triggered the -Xcheck:jni option. The org.apache... test

suite uses a similar workaround.

  1. … 1 more file in changeset.
Fix a couple bugs in the old org.tigris authentication callback implementation

in JavaHL, which were exposed by the authn callback changes.

[in subversion/bindings/javahl]

* src/org/tigris/subversion/javahl/SVNClient.java

(SVNClient.PromptUser1Wrapper.userAllowedSave): Forward the call to the

prompter, if it supports this method.

* tests/org/tigris/subversion/javahl/SVNTests.java

(SVNTest.DefaultPromptUserPassword.prompt): Return true, indicating success,

not false, which indicates cancellation.

  1. … 1 more file in changeset.
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicStatus): Following up on r1576341, apply a similar fix here.

Fix some typos.

* CHANGES:

* contrib/cgi/mirror_dir_through_svn.cgi:

* contrib/client-side/emacs/psvn.el:

* contrib/client-side/svn2cl/svn2cl.xsl:

* contrib/hook-scripts/remove-zombie-locks.py:

* contrib/hook-scripts/syntax-check.sh:

* contrib/server-side/svnstsw/configure.ac:

* notes/assurance.txt:

* notes/fs-improvements.txt:

* notes/knobs:

* notes/merge-tracking/func-spec.html:

* notes/merge-tracking/summit-survey.html:

* notes/wc-ng/design:

* notes/wc-ng/locking:

* notes/wc-ng/nodes:

* subversion/bindings/ctypes-python/csvn/core/__init__.py:

* subversion/bindings/ctypes-python/examples/example.py:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java:

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java:

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java:

* subversion/bindings/swig/include/proxy_apr.swg:

* subversion/bindings/swig/perl/native/Client.pm:

* subversion/bindings/swig/perl/native/t/3client.t:

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c:

* subversion/include/private/svn_diff_tree.h:

* subversion/include/private/svn_io_private.h:

* subversion/include/private/svn_ra_svn_private.h:

* subversion/include/private/svn_string_private.h:

* subversion/include/svn_io.h:

* subversion/include/svn_iter.h:

* subversion/include/svn_props.h:

* subversion/libsvn_client/copy_foreign.c:

* subversion/libsvn_client/diff.c:

* subversion/libsvn_client/merge.c:

* subversion/libsvn_delta/xdelta.c:

* subversion/libsvn_diff/diff4.c:

* subversion/libsvn_diff/util.c:

* subversion/libsvn_fs/editor.c:

* subversion/libsvn_fs_fs/index.c:

* subversion/libsvn_fs_fs/temp_serializer.c:

* subversion/libsvn_fs_fs/temp_serializer.h:

* subversion/libsvn_fs_fs/transaction.c:

* subversion/libsvn_fs_fs/tree.c:

* subversion/libsvn_fs_x/fs.h:

* subversion/libsvn_fs_x/index.c:

* subversion/libsvn_fs_x/reps.c:

* subversion/libsvn_fs_x/temp_serializer.c:

* subversion/libsvn_fs_x/temp_serializer.h:

* subversion/libsvn_fs_x/transaction.c:

* subversion/libsvn_fs_x/tree.c:

* subversion/libsvn_ra_serf/README:

* subversion/libsvn_ra_svn/protocol:

* subversion/libsvn_repos/dump.c:

* subversion/libsvn_repos/hooks.c:

* subversion/libsvn_repos/load-fs-vtable.c:

* subversion/libsvn_subr/dirent_uri.c:

* subversion/libsvn_subr/io.c:

* subversion/libsvn_subr/opt.c:

* subversion/libsvn_subr/string.c:

* subversion/libsvn_subr/subst.c:

* subversion/libsvn_wc/entries.c:

* subversion/libsvn_wc/externals.c:

* subversion/libsvn_wc/lock.c:

* subversion/libsvn_wc/update_editor.c:

* subversion/svn/file-merge.c:

* subversion/svn/status-cmd.c:

* subversion/svnlook/svnlook.c:

* subversion/svnrdump/load_editor.c:

* subversion/svnserve/svnserve.c:

* subversion/tests/cmdline/commit_tests.py:

* subversion/tests/cmdline/diff_tests.py:

* subversion/tests/cmdline/merge_reintegrate_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/revert_tests.py:

* subversion/tests/cmdline/svnauthz_tests.py:

* subversion/tests/cmdline/svntest/factory.py:

* subversion/tests/cmdline/svntest/main.py:

* subversion/tests/libsvn_repos/repos-test.c:

* subversion/tests/libsvn_subr/string-test.c:

* subversion/tests/libsvn_subr/utf-test.c:

* subversion/tests/libsvn_wc/db-test.c:

* subversion/tests/svn_test_main.c:

* tools/dev/trails.py: Fix some typos.

Patch by: Veres Lajos <vlajos{_AT_}gmail.com>

(I removed some changes that were wrong or can't be made due to API breakage)

  1. … 90 more files in changeset.
Fix some typos.

* CHANGES:

* contrib/client-side/emacs/psvn.el:

* contrib/client-side/svn-merge-vendor.py:

* contrib/hook-scripts/remove-zombie-locks.py:

* contrib/server-side/svnmirror.sh:

* contrib/server-side/svnmirror-test.sh:

* notes/meetings/berlin-11-agenda:

* notes/unicode-composition-for-filenames:

* notes/wc-ng/conflict-storage:

* notes/wc-ng/conflict-storage-2.0:

* subversion/bindings/ctypes-python/test/wc.py:

* subversion/bindings/cxxhl/src/aprwrap/hash.hpp:

* subversion/bindings/cxxhl/tests/test_aprwrap.cpp:

* subversion/bindings/javahl/native/JNICriticalSection.h:

* subversion/bindings/javahl/native/JNIUtil.cpp:

* subversion/bindings/javahl/native/jniwrapper/jni_env.hpp:

* subversion/bindings/javahl/native/NativeStream.hpp:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java:

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java:

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java:

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java:

* subversion/bindings/swig/perl/native/Client.pm:

* subversion/include/private/svn_sqlite.h:

* subversion/include/private/svn_subr_private.h:

* subversion/include/svn_client.h:

* subversion/include/svn_client_mtcc.h:

* subversion/include/svn_diff.h:

* subversion/libsvn_fs_fs/rep-cache.c:

* subversion/libsvn_fs_x/rep-cache.c:

* subversion/libsvn_ra_serf/options.c:

* subversion/libsvn_subr/io.c:

* subversion/libsvn_subr/string.c:

* subversion/libsvn_subr/utf8proc.c:

* subversion/libsvn_wc/adm_crawler.c:

* subversion/libsvn_wc/diff_local.c:

* subversion/libsvn_wc/wc_db_update_move.c:

* subversion/libsvn_wc/wc-metadata.sql:

* subversion/svn/status-cmd.c:

* subversion/tests/cmdline/diff_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/README:

* subversion/tests/cmdline/svnadmin_tests.py:

* subversion/tests/cmdline/svnauthz_tests.py:

* subversion/tests/cmdline/svndumpfilter_tests.py:

* subversion/tests/cmdline/svnrdump_tests.py:

* subversion/tests/cmdline/svntest/factory.py:

* subversion/tests/libsvn_wc/wc-queries-test.c:

* tools/dev/build-svn-deps-win.pl: Fix some typos.

  1. … 50 more files in changeset.
Make the compatibility JavaHL tests work off a symlinked RAM disk.

This change is equivalent to the one already made to the org.apache tests.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(MyChangelistCallback.doChangelist): Canonicalize the incoming path.

JavaHL warning cleanup.

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/ClientNotifyInformation.java

(ClientNotifyInformation.ClientNotifyInformation): Mark deprecated.

* src/org/apache/subversion/javahl/ISVNClient.java

(ISVNClient.move, ISVNClient.mergeReintegrate): Mark deprecated.

* src/org/apache/subversion/javahl/SVNClient.java

(SVNClient.getLastPath, SVNClient.move, SVNClient.mergeReintegrate):

Mark deprecated.

* tests/org/apache/subversion/javahl/BasicTests.java,

tests/org/tigris/subversion/javahl/BasicTests.java

(BasicTests.MyChangelistCallback): Add missing serialVersionUID.

  1. … 4 more files in changeset.
[in subversion/bindings/javahl/tests/org/tigris/subversion/javahl]

* BasicTests.java, RunTests.java, SVNTests.java, WC.java:

Suppress more warnings in the org.tigris namespace wrappers for JavaHL.

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testTreeConflict): Handle the current state where the right-src of an

incoming delete is null.

  1. … 1 more file in changeset.
Regression test for r1354626.

[ in subversion/bindings/javahl/ ]

* tests/org/apache/subversion/javahl/BasicTests.java

* tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicLogMessage): Test non-canonical URL target.

  1. … 1 more file in changeset.
Follow-up to r1206576: Blind attempt to fix JavaHL test failure.

[in subversion/bindings/javahl/tests]

* org/tigris/subversion/javahl/BasicTests.java,

org/apache/subversion/javahl/BasicTests.java

(testDiff): Append newline to property value to obtain expected diff output.

  1. … 1 more file in changeset.
Fix spelling of committed everywhere.

* contrib/hook-scripts/enforcer/enforcer,

* notes/merge-tracking/func-spec.html,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItemStateFlags.java,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/CommitMessageCallback.java,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItem.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitItemStateFlags.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/CommitMessage.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java,

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java,

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java,

* subversion/include/svn_repos.h,

* subversion/libsvn_client/mergeinfo.c,

* tools/hook-scripts/svnperms.py:

s/commited/committed/g.

  1. … 18 more files in changeset.
Try to make the javahl tests pass on the buildbots.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

(BasicTests.testBasicInfo2): Add path to assert message, adjust depth

expectaitions based on node type.

  1. … 1 more file in changeset.
As a failed attempt to fix the JavaHL tests on the buildbots, revert the javahl

test changes of r1132461. I expected that javahl used the new libsvn_client info

api, but it looks like it still uses the old version.

Somehow this patch just reverses the real and expected values.

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

(testBasicInfo2): Expect depth unknown on files via the old api.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicInfo2): Expect depth unknown on files via the old api.

  1. … 1 more file in changeset.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

(testBasicInfo2): Expect depth unknown on files via the new api.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicInfo2): Expect depth unknown on files via the new api.

* subversion/libsvn_client/deprecated.c

(info_from_info2): Restore old value for the old api, but watch out not to

override excluded.

  1. … 2 more files in changeset.
Just padding my stats.

(Actually, doing my regular trailing whitespace removal, similar to r875968.)

* everywhere:

for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`

done

  1. … 166 more files in changeset.
Following up on r998183, stop expecting that the modifications have been

copied. This should fix the javahl tests on the buildbot

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

(testTreeConflict): Update expected status.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testTreeConflict): Update expected status.

  1. … 1 more file in changeset.
Fix javahl testBasicRevert by adjusting the expected outcome to match

the new single-db behaviour.

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicRevert): Children of a deleted/removed directory show up as

status deleted, revert restores the tree.

  1. … 1 more file in changeset.
JavaHL: Remove the testBasicNodeKind test. The test seems a bit silly in

that it was just asserting some specific SVN behaviors and did not seem

particularly relevant to testing that the bindings are working. The main

issue is that the test was mostly asserting behavior that was changed for

the better by WC-NG. So I could not figure out a reason for it to still

exist.

[ in subversion/bindings/javahl/ ]

* tests/org/apache/subversion/javahl/BasicTests.java

* tests/org/tigris/subversion/javahl/BasicTests.java

(testBasicNodeKind) - removed test

  1. … 1 more file in changeset.
JavaHL: Fix a test assumption for SINGLE_DB

[ in subversion/bindings/javahl/ ]

* tests/org/apache/subversion/javahl/BasicTests.java:

* tests/org/tigris/subversion/javahl/BasicTests.java:

(testBasicDelete): Do not expect a deleted folder to be on disk

  1. … 1 more file in changeset.
JavaHL: Fix a reference to a value to refer to the right class.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java

(askTrustSSLServer): Use the enum in PromptUserPassword3.

JavaHL: Followup to previous commit. Restoring the set of the username as

it appears to be needed for local tests to use that username. The prompt

is only called when server challenges.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/SVNTests.java

(initClient): Set username to jrandom.

JavaHL: Update the legacy tests to use more of the callback functions to

demonstrate that these are currently broken in trunk.

NOTE: these callbacks would even be broken if the code was using the new

package names.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/SVNTests.java

(initClient): Setup the JavaHL password and progress callbacks.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testObstructionTolerance):

Following up on r963726, also comment this test in the compat test runner.

Follow-up to r965520. Fix a failure in the javahl-compat tests in the same way

as was done for the org.apache tests.

Update a javahl test to always display a diff header, even if we just have

property changes.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java

(testDiff): Add diff headers to the expected diff output.

Trailing whitespace scrub.

* subversion/libsvn_subr/prompt.c,

subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java,

subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java,

subversion/bindings/javahl/native/CreateJ.cpp,

subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java,

subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info2.java,

subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java,

subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c,

subversion/bindings/swig/ruby/test/test_wc.rb,

subversion/bindings/swig/ruby/svn/wc.rb,

subversion/tests/libsvn_subr/mergeinfo-test.c,

subversion/tests/cmdline/mergeinfo_tests.py,

subversion/tests/cmdline/log_tests.py,

subversion/tests/cmdline/upgrade_tests.py,

subversion/tests/cmdline/lock_tests.py,

subversion/tests/cmdline/switch_tests.py,

subversion/tests/cmdline/merge_authz_tests.py,

subversion/tests/cmdline/update_tests.py,

subversion/tests/cmdline/svntest/actions.py,

subversion/tests/cmdline/patch_tests.py,

subversion/tests/cmdline/merge_tests.py,

subversion/tests/cmdline/checkout_tests.py,

subversion/tests/libsvn_fs_fs/fs-pack-test.c,

subversion/libsvn_ra_svn/client.c,

subversion/svn/cl.h,

subversion/svn/notify.c,

subversion/include/svn_io.h,

subversion/include/svn_wc.h,

subversion/include/private/svn_wc_private.h,

subversion/libsvn_wc/util.c,

subversion/libsvn_wc/adm_ops.c,

subversion/libsvn_wc/status.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/wc_db.c,

subversion/libsvn_wc/wc_db.h,

subversion/libsvn_wc/upgrade.c,

subversion/libsvn_wc/workqueue.c,

subversion/libsvn_client/switch.c,

subversion/libsvn_client/externals.c,

subversion/libsvn_client/merge.c,

subversion/libsvn_client/patch.c,

subversion/libsvn_client/revert.c,

subversion/libsvn_client/copy.c,

subversion/libsvn_client/mergeinfo.c,

subversion/libsvn_client/update.c,

subversion/libsvn_client/commit_util.c,

subversion/libsvn_client/cleanup.c,

subversion/libsvn_ra_neon/ra_neon.h,

subversion/libsvn_repos/load.c,

subversion/libsvn_fs_fs/fs_fs.c,

subversion/libsvn_fs_fs/fs.h,

build/generator/gen_vcnet_vcproj.py,

build/generator/gen_win.py:

Scrub trailing whitespace.

  1. … 54 more files in changeset.
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/WC.java:

Remove unneeded imports.