Checkout Tools
  • last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Expose the output arguments of svn_client_blame6 in JavaHL.

[in subversion/bindings/javahl/src/org/apache/subversion]

* callback/BlameRangeCallback.java: New callback for ISVNClient.blame.

* callback/BlameLineCallback.java: Remove unused import.

* ISVNClient.java

(ISVNClient.blame): Add range callback parameter. Update docstring.

* SVNClient.java

(SVNClient.blame): Update wrapper and native method declaration.

[in subversion/bindings/javahl/native]

* BlameCallback.h

(BlameCallback::BlameCallback): Change constructor signature.

(BlameCallback::get_start_revnum_p, BlameCallback::get_end_revnum_p): New.

(BlameCallback::setRange): New.

(BlameCallback::m_start_revnum, BlameCallback::m_start_revnum,

BlameCallback::m_range_callback_invoked, BlameCallback::m_range_callback): New.

(BlameCallback::m_line_callback): Renamed from m_callback.

* BlameCallback.cpp: Include svn_private_config.h.

(BlameCallback::BlameCallback): Update constructor implementation.

(BlameCallback::callback): Update static callback implementation.

(BlameCallback::setRange): Implement.

(BlameCallback::singleLine): Notice changed member variable name.

* SVNClient.cpp

(SVNClient::blame): Set blame output arguments from the callback.

* org_apache_subversion_javahl_SVNClient.cpp

(Java_org_apache_subversion_javahl_SVNClient_blame): Update native method.

[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]

* BasicTests.java

(BlameRangeCallbackImpl): New helper class.

(testBinaryBlame): Also test the returned revision range.

* ExceptionTests.java

(testBlameCallback): Check that a null range callback doesn't cause exceptions.

  1. … 8 more files in changeset.
Fix issue #4801: Make JavaHL blame return byte[] file contents in the

blame callback instead of assuming they can be converted to String.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl]

* ISVNClient.java

(ISVNClient.blame): Add a new overload that uses the new BlameLineCallback.

Deprecate the other two overloads that use BlameCallback.

* SVNClient.java

(SVNClient.blame): Implement new native overload and deprecate the old ones.

(SVNClient.BlameCallbackAdapter): New helper class.

* callback/BlameCallback.java

(BlameCallback): Deprecated.

* callback/BlameLineCallback.java

(BlameLineCallback): New, replaces BlameCallback.

[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]

* BasicTests.java

(testBasicBlame, testBlameWithDiffOptions): Suppress deprecation warnings

as these tests use the old API, and should continue to do so in order to

test the callback adapter.

(testBinaryBlame): New test case.

(collectBlameLines, BlameCallbackImpl): Suppress deprecation warnings.

(BlameLineCallbackImpl): New helper class.

* ExceptionTests.java

(testBlameCallback): Use the new API in this test case.

[in subversion/bindings/javahl/native]

* org_apache_subversion_javahl_SVNClient.cpp

(Java_org_apache_subversion_javahl_SVNClient_blame): Update parameter order.

* BlameCallback.cpp

(BlameCallback::singleLine): Use BlameLineCallback instead of BlameCallback.

  1. … 6 more files in changeset.
Fix various warnings in javahl

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/types/RevisionRange.java,

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

tests/org/apache/subversion/javahl/SVNRemoteTests.java:

Use "Long.valueOf(long)" instead of deprecated "new Long(long)"

* native/RemoteSession.cpp, native/RemoteSession.h,

native/org_apache_subversion_javahl_remote_RemoteSession.cpp,

native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp,

native/org_apache_subversion_javahl_util_PropLib.cpp: Rename "jvalue"

variables to fix -Wshadow warnings for jvalue symbol in jni.h

  1. … 6 more files in changeset.
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.
Add an overload to JavaHL's ISVNClient.logMessages() that allows

the API user to retreive all revision properties with each log message.

[in subversion/bindings/javahl/]

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

(ISVNClient.logMessages): Add new overload for 1.10.

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

(ISVNClient.logMessages): Update native signature. Implement the old,

deprecated method.

* native/org_apache_subversion_javahl_SVNClient.cpp

(Java_org_apache_subversion_javahl_SVNClient_logMessages):

Update implementation of native method.

* native/SVNClient.h (SVNClient::logMessages): Update signature.

* native/SVNClient.cpp (SVNClient::logMessages): Update implementation.

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

tests/org/apache/subversion/javahl/ExceptionTests.java: Use the new overload.

  1. … 5 more files in changeset.
Follow up to r1688273:

Minor spelling and documentation fixes, no functional change.

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java

(ReposVerifyCallback.onVerifyError): Fix typo in docstring.

* native/ReposVerifyCallback.h

(ReposVerifyCallback::m_jverify_cb): Renamed from m_verify_cb.

(ReposVerifyCallback::ReposVerifyCallback): Add docstring and rename parameter.

(ReposVerifyCallback::callback): Fix docstring.

* native/ReposVerifyCallback.cpp

(ReposVerifyCallback::ReposVerifyCallback): Remove docstring. Rename variables.

(ReposVerifyCallback::onVerifyError): Rename variables.

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

(SVNReposTests.VerifyCallback.onVerifyError): Add braces to compound conditional.

(SVNReposTests.tryToBreakRepo): Renamed from trytobreakrepo. Update callers.

(SVNReposTests.testVerifyBrokenRepo,

SVNReposTests.testVerifyBrokenRepo_KeepGoing): Make the test setup more explicit.

  1. … 3 more files in changeset.
Follow up to r1687769: Implement semantics equivalent to the new

svn_repos_verify_fs3 in JavaHL.

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/callback/ReposVerifyCallback.java

(ReposVerifyCallback): New callback interface.

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

(ISVNRepos.verify): Add the verification callback and update the

documentation of both versions of this method.

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

(ISVNRepos.verify): Update native method signature and wrapper

method implementation.

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

(ReposNotifyInformation): Update serial version UID after 1.9 API change.

* native/ReposVerifyCallback.h,

native/ReposVerifyCallback.cpp: New files.

* native/JNIUtil.h

(JNIUtil::createClientException): New.

(JNIUtil::wrappedCreateClientException): Renamed from wrappedHandleSVNError

and changed the the return type.

* native/JNIUtil.cpp

(JNIUtil::wrappedCreateClientException): Return the created exception

instead of throwing it.

(JNIUtil::createClientException): Implement.

(JNIUtil::handleSVNError): Reimplement to call createClientException.

* native/SVNRepos.h: Include ReposVerifyCallback.h.

(SVNRepos::Verify): Add the repository verification callback.

* native/SVNRepos.cpp: Do not include ReposNotifyCallback.h.

(SVNRepos::Verify): Use the repository verification callback.

* native/org_apache_subversion_javahl_SVNRepos.cpp

(Java_org_apache_subversion_javahl_SVNRepos_verify): Add the

repository verification callback and update the implementation.

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

(SVNReposTests.testVerify): Tweak repository creation.

(SVNReposTests.VerifyCallback, SVNReposTests.trytobreakrepo): New helpers.

(SVNReposTests.testVerifyBrokenRepo,

SVNReposTests.testVerifyBrokenRepo_KeepGoing): New test cases.

  1. … 11 more files in changeset.
Fix a minor omission in JavaHL's VersionExtended class:

the dispose() and finalize() methods were missing.

[in subversion/bindings/javahl]

* src/org/apache/subversion/javahl/types/VersionExtended.java

(VersionExtended.dispose, VersionExtended.finalize): Add methods.

* VersionExtended.h

(VersionExtended::getCppObject): Return a non-const pointer;

the implementation of dispose() cannot use an immutable object.

* VersionExtended.cpp

(VersionExtended::getCppObject): Update implementation.

* org_apache_subversion_javahl_types_VersionExtended.cpp:

Include svn_private_config.h

(Java_org_apache_subversion_javahl_types_VersionExtended_dispose):

Implement native method.

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

(BasicTests.testVersionExtendedQuiet,

BasicTests.testVersionExtendedVerbose): Dispose the VersionExtended object.

  1. … 4 more files in changeset.
Fix issue #4560.

* subversion/libsvn_client/copy.c

(pin_externals_prop): When the externals_to_pin hash is not NULL,

do not pin externals that are not mentioned in that hash.

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

(BasicTests.setupPinExternalsTest,

BasicTests.testCopyPinExternals_wc2wc,

BasicTests.testCopyPinExternals_wc2repo,

BasicTests.testCopyPinExternals_repo2wc,

BasicTests.testCopyPinExternals_repo2repo,

BasicTests.testCopyPinExternals_repo2repo_explicit): Update test cases.

(BasicTests.testCopyPinExternals_repo2repo_corkscrew): New test case.

Patch by: stsp

(Test fixes by me)

  1. … 1 more file 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. … 2 more files in changeset.
In JavaHL: Make RemoteSession.getLog() implement its documented behavior

when the list of revision properties is NULL.

* subversion/bindings/javahl/native/RemoteSession.cpp

(RemoteSession::getLog): Pass NULL revision property list if java provides

a NULL list. (An empty list is handled as no properties. The Iterator

handles NULL as no items).

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

(testGetLog): Assert that revision properties are really fetched.

  1. … 1 more file in changeset.
* subversion/bindings/javahl/native/jniwrapper/jni_base.cpp

(Java::caught_java_exception_error): When a java exception is thrown, wrap it in the

error and exit exception state to allow further JNI calls.

* subversion/bindings/javahl/native/OperationContext.cpp

(OperationContext::checkCancel): If the JVM is in exception state (e.g. when an

exception is thrown from a callback that doesn't support error return), return

an error from the cancel callback with the wrapped exception (and exit exception

state)

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

(*): Add some comments. Make throws a bit less generic

(testNotify): New test, verifying that even an exception from the notify callback

gets through.

  1. … 2 more files in changeset.
In JavaHL: Properly wrap Java exceptions as svn_error_t * when returning from

many callbacks and add the wrapped exception (when not cleared by Subversion)

as cause to the returned exception.

This avoids keeping the JVM in the semi-broken 'exception' state until we

somehow return and also makes it possible to do things in further callbacks

(which we previously skipped by just returning an SVN_NO_ERROR on the still

pending exceptions).

Before this patch a status call that returned an exception in the first

callback would continue the entire status walk and only after returning

it would return the exception, potentially breaking the api contract

of the function.

After this patch an error is returned in Subversion... which builds

the usual error chain in subversion.... Then when the call returns

in JavaHL the cause of the ClientException is set to the originally

raised exception in the callback and intermediate errors are added

if necessary.

* subversion/bindings/javahl/native/BlameCallback.cpp

(BlameCallback::singleLine): Update exit handling.

* subversion/bindings/javahl/native/CommitCallback.cpp

(CommitCallback::commitInfo): Update exit handling.

* subversion/bindings/javahl/native/CommitMessage.cpp

(CommitMessage::getCommitMessage): Return svn_error_t * on error instead of

trying the commit with no log message.

* subversion/bindings/javahl/native/DiffSummaryReceiver.cpp

(DiffSummaryReceiver::onSummary): Update exit handling.

* subversion/bindings/javahl/native/InfoCallback.cpp

(InfoCallback::singleInfo): Update exit handling.

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

(SVN_ERR_JAVAHL_WRAPPED): New constant.

(assemble_error_message): Don't try to write standard text for

SVN_ERR_JAVAHL_WRAPPED.

(JNIUtil::wrappedHandleSVNError): If there is no jcause passed, check if we

have a Java exception we can use stored in the error.

(WrapExceptionTag): New variable.

(WrappedException): New class.

(JNIUtil::wrapJavaException,

JNIUtil::unwrapJavaException): New functions.

* subversion/bindings/javahl/native/JNIUtil.h

(JNIUtil::wrapJavaException,

JNIUtil::unwrapJavaException): New functions.

(POP_AND_RETURN_EXCEPTION_AS_SVNERROR): New define.

* subversion/bindings/javahl/native/ListCallback.cpp

(ListCallback::doList): Update exit handling.

* subversion/bindings/javahl/native/LogMessageCallback.cpp

(LogMessageCallback::singleMessage): Update exit handling.

* subversion/bindings/javahl/native/StatusCallback.cpp

(StatusCallback::doStatus): Update exit handling.

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

New file.

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

(SVNTestSuite.suite): Add ExceptionTests.

  1. … 10 more files in changeset.
For now revert r1664609.

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

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

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

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

Revert to pre r1664609 change.

  1. … 1 more file in changeset.
Tweak JavaHL error text generation to create errors that only contains

generic error messages when the creator of the error chain intended

to add these to the chain.

This makes the creation more similar to what our standard error printing

in 'svn' would do and avoids bad messages in cases such as 'bad filename'

when the code just used that error code to tell that a registry key does

not exist, but added their own detailed message.

Note that all these messages are localized, etc. so end user applications

can never rely on the exact messages anyway.

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

(testValidateProp): Update expected result.

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

(testGetLogMissing): Update expected result.

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

(testCommitPartialMove): Update expected result.

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

(assemble_error_message): Only show generic messages if there is no not

generic message, and the generic message wasn't the last shown generic

message.

  1. … 1 more file in changeset.
Expose the metadataOnly option that is already implemented in libsvn_client's

copy support through the api.

This should have been added when revving the api, as this api has been

available at the libsvn_wc level since 1.8 (and at least used by AnkhSVN

since then).

* subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp

(Java_org_apache_subversion_javahl_SVNClient_copy): Pass metadataOnly.

* subversion/bindings/javahl/native/SVNClient.cpp

(SVNClient::copy): Pass metadataOnly.

* subversion/bindings/javahl/native/SVNClient.h

(SVNClient::copy): Pass metadataOnly.

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

(copy): Add and document metadataOnly argument.

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

(copy): Add and document metadataOnly argument.

(copy): Update caller.

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

(testCopy,

testCopyPinExternals_wc2wc,

testCopyPinExternals_wc2repo,

testCopyPinExternals_repo2wc,

testCopyPinExternals_repo2repo,

testCopyPinExternals_repo2repo_explicit,

setupAndPerformMerge): Update caller.

* subversion/include/svn_client.h

(svn_client_copy7): Add argument.

* subversion/libsvn_client/copy.c

(svn_client_copy7): Add argument. Update caller.

* subversion/libsvn_client/deprecated.c

(svn_client_copy6): Update caller.

* subversion/svn/copy-cmd.c

(svn_cl__copy): Update caller.

* subversion/tests/libsvn_client/client-test.c

(test_copy_pin_externals): Update caller.

* subversion/tests/libsvn_wc/utils.c

(sbox_wc_copy_url): Update caller.

  1. … 11 more files in changeset.
Pre branch cleanup: Remove unneeded tab characters from source files.

* 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/swig/perl/libsvn_swig_perl/swigutil_pl.h

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

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c

* subversion/libsvn_subr/sorts.c

Replace tabs with spaces, trying to fix indenting.

  1. … 6 more files in changeset.
Merge the pin-externals branch to trunk.

The discussion thread start in this post:

http://mail-archives.apache.org/mod_mbox/subversion-dev/201501.mbox/%3C20150128095434.GM26869%40ted.stsp.name%3E

has come to a consensus that the branch can be merged and additional

development of this feature can happen on trunk.

This merge adds a '--pin-externals' option to 'svn copy'.

This option enables automated pinning of URLs in svn:externals properties

during copy operations (issue #1258).

--pin-externals : pin externals with no explicit revision to their

last-changed revision (recommended when tagging)

This feature makes the svncopy.pl contrib script unnecessary.

Externals are "pinned" by adding a peg revision to the external's source URL.

For example, the external definition:

^/foo/bar ext_bar

might become:

^/foo/bar@400 ext_bar

This table shows which revision is used for pinning:

copy source: working copy (WC) REPOS

------------+------------------------+---------------------------+

copy WC | external's WC BASE rev | external's repos HEAD rev |

dest: |------------------------+---------------------------+

REPOS | external's WC BASE rev | external's repos HEAD rev |

------------+------------------------+---------------------------+

An external that is already pinned is left as-is.

Please see the branch log for details about these changes.

  1. … 22 more files in changeset.
Extend regression tests around svn_ra_get_file_revs2, and walking through

history with it. Add additional boolean to JavaHL api for this function.

* subversion/bindings/javahl/native/RemoteSession.cpp

(callback): Pass information on whether there is a delta.

(call): Pass boolean.

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

(FileRevision.FileRevision): Add textDelta argument. Fill field.

(FileRevision.hasTextDelta): New function.

(FileRevision.textDelta): New field.

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

(testGetFileRevisions): Extend test.

* subversion/libsvn_repos/rev_hunt.c

(send_path_revision): Avoid doing work that is ignored.

* subversion/tests/libsvn_client/mtcc-test.c

(handle_rev_baton): New struct.

(handle_rev,

test_file_revs_both_ways): New function.

(test_funcs): Add test_file_revs_both_ways.

  1. … 4 more files in changeset.
Merge the svn-auth-x509 branch to trunk.

This adds an X.509 parser which we use to display certificates via the auth

command rather than storing the details provided by serf from a connection.

* LICENSE,

NOTICE: Note that the X.509 parser is based on the parser from TropicSSL.

* build.conf

(libsvn_subr): Add svn_x509.h header to msvc-export.

(x509-test, __ALL_TESTS__): Add C tests for X.509 parser.

* subversion/include/private/svn_utf_private.h

(svn_utf__encode_ucs4_string, svn_utf__utf16_to_utf8,

svn_utf__utf32_to_utf8): New functions for converting various Unicode

character encodings needed by the X.509 parser.

* subversion/include/svn_x509.h: New header.

* subversion/include/svn_error_codes.h

(SVN_ERR_X509_CATEGORY_START): New category for errors from X.509 parser.

(SVN_ERR_ASN1_OUT_OF_DATA, SVN_ERR_ASN1_UNEXPECTED_TAG,

SVN_ERR_ASN1_INVALID_LENGTH, SVN_ERR_ASN1_LENGTH_MISMATCH,

SVN_ERR_ASN1_INVALID_DATA, SVN_ERR_X509_FEATURE_UNAVAILABLE,

SVN_ERR_X509_CERT_INVALID_PEM, SVN_ERR_X509_CERT_INVALID_FORMAT,

SVN_ERR_X509_CERT_INVALID_VERSION, SVN_ERR_X509_CERT_INVALID_SERIAL,

SVN_ERR_X509_CERT_INVALID_ALG, SVN_ERR_X509_CERT_INVALID_NAME,

SVN_ERR_X509_CERT_INVALID_DATE, SVN_ERR_X509_CERT_INVALID_PUBKEY,

SVN_ERR_X509_CERT_INVALID_SIGNATURE, SVN_ERR_X509_CERT_INVALID_EXTENSIONS,

SVN_ERR_X509_CERT_UNKNOWN_VERSION, SVN_ERR_X509_CERT_UNKNOWN_PK_ALG,

SVN_ERR_X509_CERT_SIG_MISMATCH, SVN_ERR_X509_CERT_VERIFY_FAILED):

New error codes.

* subversion/include/svn_config.h

(SVN_CONFIG_AUTHN_HOSTNAME_KEY, SVN_CONFIG_AUTHN_FINGERPRINT_KEY,

SVN_CONFIG_AUTHN_VALID_FROM_KEY, SVN_CONFIG_AUTHN_VALID_UNTIL_KEY,

SVN_CONFIG_AUTHN_ISSUER_DN_KEY): Remove constants used as keys for

storing parsed certificate info in authn files.

* subversion/libsvn_subr/x509parse.c,

subversion/libsvn_subr/x509info.c,

subversion/include/x509.h: New files for implementing the X.509 parser.

* subversion/libsvn_subr/ssl_server_trust_providers.c

(ssl_server_trust_file_first_credentials,

ssl_server_trust_file_save_credentials): Don't store/retrive parsed

details of X.509 certificates.

* subversion/libsvn_subr/utf.c

(membuf_insert_ucs4, svn_utf__utf16_to_utf8, svn_utf__utf32_to_utf8):

New functions to implement Unicode conversions.

* subversion/libsvn_subr/utf8proc.c

(encode_ucs4_string): Convert to the private function ...

(svn_utf__encode_ucs4_string): New function.

(svn_utf__glob): Update caller.

* subversion/svn/auth-cmd.c

(match_credential): Remove code to match the hostname/fingerprint since

the data isn't stored.

(show_cert): New function to drive the X.509 parser and then display

the certificate to the user.

(list_credential): Use show_cert().

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

(test_utf_conversions, test_funcs): Add tests for new unicode character

set conversions.

* subversion/tests/libsvn_subr/x509-test.c: Add tests for X.509 parser.

[in subverison/bindings/javahl]

* native/jniwrapper/jni_base.cpp,

native/jniwrapper/jni_exception.hpp:

Add IllegalArgumentException exeption.

* native/AuthnCallback.cpp,

native/AuthnCallback.hpp,

src/org/apache/subversion/javahl/callback/AuthnCallback.java:

(AuthnCallback::SSLServerCertInfo): Update the getters and constructor to

reflect the info available from the X.509 parser.

* native/org_apache_subversion_javahl_util_ConfigLib.cpp

(build_credential): Update to feed AuthnCallback::SSLServerCertInfo the info

that is available.

(Java_org_apache_subversion_javahl_util_ConfigLib_nativeSearchCredentials):

Update the searching of the certificates to parse the certificate rather

than depending on the stored data.

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

(SVNUtil.searchCredentials): Update hostnamePattern documentation.

* native/Promper.cpp

(Prompter::dispatch_ssl_server_trust_prompt): Update to reflect changes

to SSLServerCertInfo.

* src/org/apache/subversion/javahl/util/ConfigLib.java: Remove some commented

out code.

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

(util_cred_ssl_server, testCredentials): Update tests as needed.

  1. … 29 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. … 3 more files in changeset.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

(BasicTests.testBlameWithDiffOptions): Fix test case; the original file

contents had no end-of-line, so the new must have none, too.

Add a JavaHL test for ISVNClient.blame with diff options

and remove the deprecation of the older blame method.

[in subversion/bindings/javahl]

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

(ISVNClient.blame): Remove deprecation.

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

(SVNClient.blame): Likewise.

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

(BasicTests.testBasicBlame): Check the contents of the blame line.

(BasicTests.testBlameWithDiffOptions): New test case.

  1. … 2 more files in changeset.
Add a JavaHL test for getting status from an external tree.

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

(BasicTests.testExternalStatus): New test case.

Remove a compilation warning in JavaHL.

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

(SVNRemoteTests.RemoteStatusReceiver.StatInfo.hashCode): Add mandatory overload.

(SVNRemoteTests.RemoteStatusReceiver.StatInfo.compareTo): Add decorator.

Finalize the JavaHL API changes for 1.9.

[in subversion/bindings/javahl]

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

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

(ISVNClient.info2): Remove the overload that was added on trunk and then

replaced by ISVNClient.info.

(ISVNClient.cleanup): Add new overload that matches svn_client_cleanup2.

(ISVNClient.vacuum): New function, matches svn_client_vacuum.

* native/SVNClient.h, native/SVNClient.cpp

(SVNClient::cleanup): Update prototype and implementation.

(SVNClient::vacuum): New method.

* native/org_apache_subversion_javahl_SVNClient.cpp

(Java_org_apache_subversion_javahl_SVNClient_cleanup):

Update native method wrapper implementation.

(Java_org_apache_subversion_javahl_SVNClient_vacuum):

Implement native method wrapper.

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

(BasicTests.collectInfos): Use ISVNClient.info instead of ISVNClient.info2.

  1. … 5 more files in changeset.
Add credentials management (searching and deleting) to JavaHL.

[in subversion/bindings/javahl]

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

(SVNUtil.CredentialTypeMismatch): New exception class.

(SVNUtil.Credential): Make concrete and serializable, and

encapsulate all credential kinds within this one class.

(SVNUtil.UsernameCredential,

SVNUtil.SimpleCredential,

SVNUtil.SSLServerCertCredential,

SVNUtil.SSLClientCertPassphraseCredential): Removed.

(SVNUtil.getCredential, SVNUtil.removeCredential, SVNUtil.searchCredentials):

Also throw SubversionException.

(SVNUtil.addCredential): Removed; not viable, there is no native API.

(SVNUtil.deleteCredentials): Removed as redundant.

* src/org/apache/subversion/javahl/util/ConfigLib.java:

Import SubversionException class.

(SVNUtil.getCredential, SVNUtil.nativeGetCredential,

SVNUtil.removeCredential, SVNUtil.nativeRemoveCredential,

SVNUtil.searchCredentials):

Also throw SubversionException.

(SVNUtil.addCredential, SVNUtil.nativeAddCredential): Removed.

(SVNUtil.deleteCredentials): Removed as redundant.

(SVNUtil.deleteCredentials): Removed.

(SVNUtil.nativeSarchCredentials): New; replaces iterateCredentials.

* native/Credential.hpp, native/Credential.cpp:

New; native implementation of the SVNUtil.Credential class.

* native/jniwrapper/jni_object.hpp, native/jniwrapper/jni_class_cache.cpp

(ClassCache.get_credential, ClassCache.get_credential_kind)

New; factory method for Credential and Credential::Kind implementations.

* native/org_apache_subversion_javahl_util_ConfigLib.cpp

(build_credential, WalkCredentialsCallback, SimpleSearchCallback):

New helper function and classes.

(Java_org_apache_subversion_javahl_util_ConfigLib_nativeGetCredential,

Java_org_apache_subversion_javahl_util_ConfigLib_nativeRemoveCredential,

Java_org_apache_subversion_javahl_util_ConfigLib_nativeSearchCredentials):

Implemented.

(Java_org_apache_subversion_javahl_util_ConfigLib_nativeAddCredential):

Removed.

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

(UtilTests.testCredentials): New test case.

  1. … 7 more files in changeset.
Modify JavaHL tests to enable testing with the deprecated

UserPasswordCallback authentication interface.

* Makefile.in

(check-deprecated-authn-javahl): New target.

(check-all-javahl): Include dependency on check-deprecated-authn-javahl.

[in subversion/bindings/javahl]

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

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

(ISVNClient.setPrompt): Add overloads for both AuthnCallback

and UserPasswordCallback variants.

* src/org/apache/subversion/javahl/remote/RemoteFactory.java

(RemoteFactory.RemoteFactory, RemoteFactory.setPrompt): Likewise.

(RemoteFactory.open): Handler both types of prompters. Update all callers.

* native/org_apache_subversion_javahl_SVNClient.cpp

(Java_org_apache_subversion_javahl_SVNClient_setPrompt*): Implement native overloads

of the ISVNClent.setPrompt() method.

* native/org_apache_subversion_javahl_remote_RemoteFactory.cpp

(Java_org_apache_subversion_javahl_remote_RemoteFactory_open):

Adjust implementation for changed prototype.

* native/RemoteSession.h, native/RemoteSession.cpp

(RemoteSession::open): Create prompter wrapper depending on which type

of prompter was set in the factory.

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

(SVNTests.DefaultPromptUserPassword): Removed.

(SVNTests.DefaultAuthn): New; factory for both variants of the prompter.

(SVNTests.initClient): Select prompter based on system propery settings.

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

tests/org/apache/subversion/javahl/SVNRemoteTests.java:

Select prompter based on system propery settings.

  1. … 8 more files in changeset.
Tweak JavaHL tests to test the authentication callback

implementation a bit more.

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

Do not set the default password in the remote session anywhere.

Reintegrated the remote-only-status branch.
  1. … 24 more files in changeset.