Checkout Tools
  • last updated a few minutes ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1497804 is being indexed.

Tweak sqlite error messages: put the error code consistently next to the

"sqlite:" prefix (except one place where there is no such prefix).

* subversion/libsvn_subr/sqlite.c

(SQLITE_ERR, SQLITE_ERR_MSG, exec_sql2, svn_sqlite__step):

Use 'sqlite[S%d]:' prefix.


Use square brackets around 'S%d' for consistency.

On the javahl-1.8-extensions branch: Sync JavaHL with trunk up to r1497790.
  1. … 10 more files in changeset.
On the javahl-1.7-extensions branch: Sync JavaHL with trunk up to r1497785.
  1. … 10 more files in changeset.
In the JavaHL RA wrapper, rename stop-on-copy to strict-node-history to

conform to the terminology in svn_ra.h.

[in subversion/bindings/javahl/native]

* RemoteSession.h, RemoteSession.cpp (RemoteSession::getLog): Update.

* org_apache_subversion_javahl_remote_RemoteSession.cpp

(Java_org_apache_subversion_javahl_remote_RemoteSession_getLog): Update.

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

*, remote/ (ISVNRemote.getLog):

Update declaration and docstring.

Show the summary of corrupt revisions if keep-going is enabled.

--quiet behaves the same irrespective of the value of keep-going.

* subversion/include/svn_repos.h

(svn_repos_notify_action_t): Add svn_repos_notify_failure_summary and

svn_repos_notify_summary to show the summary of corruptions.

* subversion/libsvn_repos/dump.c

(notify_verification_summary): New function to notify the summary title.

(notify_verification_error_summary): New function to notify the actual

summary of the corrupt revisions.

(error_list): New struct with the revnum and the err to show in summary.

(err_cleanup): Function to cleanup the pool.

(populate_summary): New function to populate an array of error_lists

with the respective revnum and err to notify in the summary.

(svn_repos_verify_fs3): Show the summary of corruptions.

* subversion/svnadmin/svnadmin.c

(repos_notify_handler): Handle notification of corruption summary

title and the actual summary of corrupt revisions.

Add methods to set the configuration change handler callback in JavaHL.

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

*, (ISVNClient.void setConfigEventHandler):

New method that registers a configuration event handler callback.

* remote/ (RemoteFactory.setConfigEventHandler): Same method.

(RemoteFactory.RemoteFactory): Initialising constructor accepts a

new ConfigEvent parameter.

( [native method] Likewise.

( Pass ConfigEvent parameter to native open().

[in subversion/bindings/javahl/native]

* RemoteSession.h, RemoteSession.cpp

(RemoteSession::open, RemoteSession::RemoteSession):

Accept new config handler parameter and pass it on to the context.

* org_apache_subversion_javahl_remote_RemoteFactory.cpp

(Java_org_apache_subversion_javahl_remote_RemoteFactory_open): Likewise.

* RemoteSessionContext.h, RemoteSessionContext.cpp

(RemoteSessionContext::RemoteSessionContext): Accept new config handler

parameter and register it in the context constructor.

* RemoteSession.cpp (RemoteSession::open): Normalize the config directory path.

* org_apache_subversion_javahl_SVNClient.cpp


Implement SVNClient.setConfigEventHandler.

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



SVNRemoteTests.testGetSession_ConfigConstructor): Update for config handler.

(SVNRemoteTests.testConfigHandler): New test case.

Implement the configuration editor interface in JavaHL.

* build.conf (private-built-includes):

Add org_apache_subversion_javahl_ConfigImpl_Category.h.

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

* (ConfigImpl): New class; implements ISVNConfig interface.

[in subversion/bindings/javahl/native]

* org_apache_subversion_javahl_ConfigImpl_Category.cpp:

Native wrapper implementation of ConfigImpl.Category.

Add a framework for manipulating in-memory configuration data in JavaHL.

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

* (ISVNConfig): New interface for reading and modifying

in-memory configuration data.

* callback/ (ConfigEvent): Callback interface for

configuration change notification hooks.

[in subversion/bindings/javahl/native]

* OperationContext.h, OperationContext.cpp



OperationContext::notifyConfigLoad): New; native configuration change

notification framework.

* OperationContext.cpp

(OperationContext::OperationContext, OperationContext::!OperationContext):

Manage the lifetime of the ConfigEvent callback object.

(OperationContext::getConfigData): Call notifyConfigLoad when the

configuration data has been loaded into memory.

[in subversion/bindings/javahl/native]

* JNIStringHolder.h (JNIStringHolder::c_str()): New conversion method.

* EnumMapper.h, EnumMapper.cpp (EnumMapper::toTristate): New reverse mapper.

Merge r1497551 from trunk:

* r1497551

Fix the Accept-Encoding header format


When IIS is used as a reverse-proxy, it chokes. And we should use the

format from the specification anyways :-P


+1: gstein, brane, danielsh

Clarify a docstring.

* subversion/include/svn_wc.h

(svn_wc_walk_status): Clarify what IGNORE_PATTERNS is, following up

on r1497487.

German translation update

* subversion/po/de.po

Review translations of "working copy path", add some translations

* branches/1.8.x/STATUS: Cast some votes.

Nominate 1497551 for backport. Add a vote/comment.

Fix the Accept-Encoding header format.

Reported by: George Schizas <gschizas{_AT_}>

* subversion/libsvn_ra_serf/update.c:

(setup_update_report_headers): use "," between format types

On the 1.8.x-r1497310-partial branch:

* subversion/svn/svn.c

(svn_cl__cmd_table): 'svn cleanup' has only one mode of operation in 1.8.x,

so it makes no sense to say "By default, ..." in the help text. So remove

that part of the first sentence and reindent the whole paragraph.

* STATUS: Nominate r1497318 and r1497319.

* STATUS: Nominate 1.8.x-r1497310-partial branch.

Partial backport of r1497310 to 1.8.x, for 'svn help cleanup' improvements.

* subversion/svn/svn.c

(svn_cl__cmd_table): Explain the purpose and effects of 'svn cleanup' better

in the output of 'svn help cleanup'.

Remove 1.8.x-r1497359-partial branch. I copy-pasted the wrong revision number.

Add branch for a partial backport of r1497359 to 1.8.x.

Follow-up to r1497487:

* subversion/tests/cmdline/

(cleanup_unversioned_items): Really test for the bug danielsh found.

* subversion/libsvn_client/cleanup.c

(do_cleanup): Indentation fix. No functional change.

Fix a bug with 'svn cleanup --remove-unversioned' where items that do not

match a user-configured global ignores list are not removed, even though

they should be removed.

Found by: danielsh

* subversion/libsvn_client/cleanup.c

(do_cleanup): Unconditionally load the configured global ignores list,

not just if --remove-ignored was passed. And don't bother with loading

ignore patterns for the cleanup target here, since the status walk

will do that for us.

* subversion/tests/cmdline/

(cleanup_unversioned_items): Extend this test to detect the bug fixed.

* subversion/libsvn_client/cleanup.c

(cleanup_status_walk): Check ctx->notify_func2 for NULL before calling it.

Suggested by: danielsh

* subversion/libsvn_client/cleanup.c

(do_cleanup): Honour user-configured default ignore list, as well as

ignore patterns defined on the cleanup target.

On the javahl-1.7-extensions branch: Sync JavaHL with trunk up to r1497370.
On the javahl-1.8-extensions branch: Sync JavaHL with trunk up to r1497365.
Implement the RA get-log operation in JavaHL.

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

*, remote/ (ISVNRemote.getLog): New method.

[in subversion/bindings/javahl/native]

* RemoteSession.h (RemoteSession::getLog): New method.

* RemoteSession.cpp (build_string_array): New helper function.

(RemoteSession::getLog): Implement.

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


(SVNRemoteTests.LogMsg, SVNRemoteTests.LogReceiver): New helper classes.

(SVNRemoteTests.testGetLog, SVNRemoteTests.testGetLogMissing): New tests.