Apache Cordova

Apache Cordova

Source changes - FishEye

Shows the 20 most recent commits for Apache Cordova.

Julian Foad committed 1693408 (4 files)
Reviews: none

On the 'move-tracking-2' branch: Change the payload resolver API to populate
the content of the existing payload structure instead of just returning the

* subversion/include/private/svn_editor3e.h
   svn_editor3_cb_payload_resolve_t): Remove the output and pool parameters
    and update the doc string.

* subversion/libsvn_delta/editor3e.c
   change_detection_payload_resolve): Remove the output and pool parameters.
  (svn_branch_subtree_differences): Simplify calls accordingly.

* subversion/include/private/svn_element.h
  (svn_element_payload_t): Add a 'pool' field.

* subversion/libsvn_delta/element.c
   svn_element_payload_create_symlink): Initialize the 'pool' field.

Branko Čibej committed 1688395 (4 files)
Reviews: none

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_KeepGoing): Make the test setup more explicit.

Julian Foad committed 1683383 (4 files)
Reviews: none

On the 'move-tracking-2' branch: Make 'payload_resolve' an editor virtual

I am not sure if the editor eventually will need to provide this, or
something like it, but for now it is useful. And it was worse, previously,
to have this as a non-virtual function, because then editors could not
successfully be chained. Now there are no non-virtual methods.

* subversion/include/private/svn_editor3e.h
  (svn_editor3_cb_payload_resolve_t): New.
  (svn_editor3_cb_funcs_t): Add the method.
  (svn_editor3_payload_resolve): Tweak the function signature as required
    for editor methods.

* subversion/libsvn_delta/compat3e.c
  (editor3_payload_resolve): Rename from 'svn_editor3_payload_resolve' and
    make static.
   svn_editor3__ev3_from_delta_for_commit): Add the method to the vtable.

* subversion/libsvn_delta/editor3e.c
   wrap_payload_resolve): New.
  (svn_editor3__get_debug_editor): Add the method to the vtable.
  (svn_branch_subtree_differences): Tweak callers accordingly.

* subversion/svnmover/svnmover.c
  (wc_commit): Display the diff after the commit has completed, rather than
    inside the commit callback, so as not to nest calls to payload_resolve
    inside the editor complete() method, as the editor framework forbids
  (commit_callback): Don't display the diff here.
  (display_diff_of_commit): New.

Julian Foad committed 1682876 (4 files)
Reviews: none

On the 'move-tracking-2' branch: Remove an editor drive ordering

Let the edit driver obtain the EID for a new element (that will be created
through the 'add' method) so that it can use this EID as the parent EID of
other elements before calling 'add'. Thus it is no longer necessary to add a
new directory before making any calls that refer to it as a parent.

* subversion/include/private/svn_editor3e.h
   svn_editor3_cb_new_eid_t): New.
   svn_editor3_cb_add_t): Don't create a new EID here. Remove the unused 'kind'
    parameter too, while we're here.
  (svn_editor3_cb_funcs_t): Add the 'new_eid' method.

* subversion/libsvn_delta/editor3e.c
   wrap_new_eid): New.
   wrap_add): Update as described above.
  (svn_editor3__get_debug_editor): Add the new method to the vtable.

* subversion/libsvn_delta/compat3e.c
  (editor3_new_eid): New.
  (editor3_add): Update as described above.
   svn_editor3__ev3_from_delta_for_commit): Add the new method to the vtable.

* subversion/svnmover/svnmover.c
   execute): Call svn_editor3_new_eid() before svn_editor3_add().

Julian Foad committed 1682292 (5 files)
Reviews: none

On the 'move-tracking-2' branch: Combine the 'instantiate' and 'alter' methods
into one, which is called 'alter' for now.

(I think it still makes sense to combine these with the 'add' method too.)

  Mention the 'add' method in the 'to do' note about this topic.

* subversion/include/private/svn_editor3e.h
  (svn_editor3_instantiate): Delete.
  (svn_editor3_alter): Update and improve the doc string.
  (svn_editor3_cb_funcs_t): Delete the 'instantiate' member.

* subversion/libsvn_delta/compat3e.c
  (editor3_instantiate): Delete.
  (editor3_alter): Cope with the case where the element doesn't already
    exist in this branch.
   svn_editor3__ev3_from_delta_for_commit): Remove the 'instantiate' method
    from the vtable.

* subversion/libsvn_delta/editor3e.c
  (svn_editor3_instantiate): Delete.
  (svn_editor3_alter): Remove a now-obsolete comment.
  (wrap_instantiate): Delete.
  (svn_editor3__get_debug_editor): Remove the 'instantiate' method
    from the vtable.

* subversion/svnmover/svnmover.c
   branch_merge_subtree_r): s/svn_editor3_instantiate/svn_editor3_alter/.

Yann Ylavic committed 1680905 (9 files)
Reviews: none

Merge r1200040, r1200372, r1200374, r1213380 from trunk.

r1200040 | pquerna | 2011-11-10 00:37:37 +0100 (Thu, 10 Nov 2011) | 5 lines

Add support for RFC 5077 TLS Session tickets. This adds two new directives:

* SSLTicketKeyFile: To store the private information for the encryption of the ticket.
* SSLTicketKeyDefault To set the default, otherwise the first listed token is used. This enables key rotation across servers.

r1200372 | pquerna | 2011-11-10 16:17:18 +0100 (Thu, 10 Nov 2011) | 4 lines

Apply ap_server_root_relative to the path used for the ticket secrets file.

Suggested by: Rüdiger Plüm

r1200374 | pquerna | 2011-11-10 16:19:15 +0100 (Thu, 10 Nov 2011) | 4 lines

Remove unneeded memcpy.

Spotted by: Rüdiger Plüm

r1213380 | kbrand | 2011-12-12 20:21:35 +0100 (Mon, 12 Dec 2011) | 9 lines

Streamline TLS session ticket key handling (added in r1200040):
- drop the SSLTicketKeyDefault directive, and only support a single
  ticket key per server/vhost
- rename the SSLTicketKeyFile directive to SSLSessionTicketKeyFile,
  remove the keyname parameter
- move ticket key parameters from SSLSrvConfigRec to modssl_ctx_t
- configure the tlsext_ticket_key_cb only when in server mode
- add documentation for SSLSessionTicketKeyFile

Branko Čibej committed 1676564 (4 files)
Reviews: none

Make JNI reference handling more robust in RA status callbacks.

This is a follow-up to r1675771.

* subversion/bindings/javahl/native/EditorProxy.cpp
   EditorProxy::cb_abort): Use a managed local JNI frame in callbacks.

* subversion/bindings/javahl/native/NativeStream.hpp
   NativeOutputStream::get_self_unsafe): New.
* subversion/bindings/javahl/native/NativeStream.cpp
   NativeOutputStream::get_self_unsafe): Implement.
   Implement missing finalizer methods.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StatusEditor.java
  (StatusEditor.addFile): Check contents stream for null before closing.

Julian Foad committed 1676563 (11 files)
Reviews: none

On the 'move-tracking-2' branch: Introduce the term 'payload' for the
props/text/symlink content of an element, as the term 'content' was not
specific enough.

* subversion/include/private/svn_branch.h,
  (svn_branch_el_rev_content_t): Rename 'content' field to 'payload'.
   ): Rename the 'node_content' parameter to 'payload'.
  Track the renames.

* subversion/include/private/svn_element.h,
  (svn_element_payload_t): Renamed from 'svn_element_content_t'.
    Renamed from 'svn_element_content_*'.

* subversion/include/private/svn_editor3e.h,
    Rename the 'new_content' parameter to 'new_payload'.
  Track the renames.

* subversion/include/private/svn_editor3e.h,
  (svn_editor3_payload_resolve): Renamed from 'svn_editor3_content_resolve'.
    Rename the 'content_p' parameter to 'payload_p'.
  (payload_fetch): Renamed from 'content_fetch'.
  Track the renames.

* subversion/svnmover/svnmover.c
  (payload_merge): Renamed from 'content_merge'.
  Track the renames.

* subversion/include/private/svn_editor3p.h,
   wrap_put): Track the renames.

* subversion/libsvn_delta/compat3p.c
   editor3_put): Track the renames.

Julian Foad committed 1670647 (4 files)
Reviews: none

On the 'ra-git' branch: update to libgit2 v0.22

Patch by: Carlos Martín Nieto <cmn{_AT_}elego.de>
  (tweaked by me: removed the quoting style change in autogen.sh)

  Specify we build against libgit2 v0.22.

* autogen.sh:
  Fix the LIBTOOL_CONFIG replacement when overriding the config file path.

* subversion/libsvn_ra_git/ra_plugin.c:
  (do_libgit_init): the init function was renamed to git_libgit2_init().
  (split_url): remotes which are not in the config are now called anonymous.
  (do_git_fetch): pass NULL to git_remote_fetch() to get default reflog entries.
  (svn_ra_git__open): git_remote_load() was renamed git_remote_lookup().
  (remote_progress_cb, svn_ra_git__open): the progress callback has been
    renamed to sideband_progress. Rename our callback function to
    remote_sideband_progress_cb to match libgit2 naming.
  (compare_git_tree_entries): git_tree_entry_byoid is now git_tree_entry_byid.

* subversion/libsvn_ra_git/reporter.c:
  (blob_relatedness_cb): delta file field oid has been renamed to id.

Julian Foad committed 1669143 (3 files)
Reviews: none

On the 'move-tracking-2' branch: Fix a Windows build problem.

* subversion/include/private/svn_editor3p.h
   svn_editor3p_cb_funcs_t): Always declare the 'resurrect' interface.

* subversion/libsvn_delta/editor3p.c
   svn_editor3p__get_debug_editor): Always define the 'resurrect' interface;
    just let its body be ifdef'd out.

* subversion/libsvn_delta/compat3p.c
   svn_delta__ev3_from_delta_for_commit): Same.

Bert Huijben committed 1665901 (1 file)
Reviews: none

Following up on r1665886, add regression test on how the prompt function
is called based on the settings in both the auth and slave auth baton.

* subversion/tests/libsvn_subr/auth-test.c
  (plaintext_baton_t): New struct.
  (plaintext_prompt_cb): New function.
  (test_save_cleartext): New function.
  (test_list): Add test_save_cleartext.

Bert Huijben committed 1665851 (1 file)
Reviews: none

* subversion/libsvn_delta/compat.c
  (alter_file_cb): Resolve compiler warning by combining two ifs.
    Move a few variable updates to before the file copy to keep comments valid.
    This also allows reducing the variable scope of the variables causing the

Bert Huijben committed 1665456 (3 files)
Reviews: none

Make all ra layers behave the same way on passing invalid revisions to

* subversion/libsvn_ra/ra_loader.c
  (svn_ra_replay): Add assertion on requirements as already checked by DAV
    and SVN.

* subversion/libsvn_repos/replay.c
  (path_driver_cb_func): Let the actual editor decide how it uses its batons.
    The standard delta editor always uses NULL batons, which doesn't make it
  (svn_repos_replay2): Apply sanity check instead of correcting.
  (svn_repos__replay_ev2): Use proper check.

* subversion/tests/libsvn_ra/ra-test.c
  (ra_revision_errors): Extend test.

Bert Huijben committed 1665259 (1 file)
Reviews: none

In ra-serf's error handling: Following up on r1557686, make sure that after we
decide to discard the body, we don't assume that the handler is no longer

A test triggering this issue will be added in a followup patch.

* subversion/libsvn_ra_serf/util.c
  (handle_response_cb): Keep the handler marked as scheduled, to allow processing
    the remaining data (by ignoring) later *or* by resetting the connection if
    the handler's pool is destroyed.

Julian Foad committed 1662667 (6 files)
Reviews: none

On the 'move-tracking-2' branch: Start implementing sequence points in the
editor, and use them to fix the deletion problem encountered in r1662505.

* subversion/include/private/svn_editor3.h
   svn_editor3_cb_sequence_point_t): New.
  (svn_editor3_cb_funcs_t): Add the 'sequence_point' method.
  (svn_branch_purge_r): New.

* subversion/libsvn_delta/branching.c
  (svn_branch_map_purge_orphans): Harden a condition: a subbranch-root
    element must never have content.
  (svn_branch_purge_r): New.
  (svn_branch_get_all_sub_branches): Rewrite so it doesn't rely on
    path-based queries and so doesn't require a sequence point.

* subversion/libsvn_delta/compat3b.c
  (editor3_delete): Don't try to delete subbranches, and so don't require a
    sequence point.
  (convert_branch_to_paths): No longer 'purge orphan elements' here, as we
    now reach a sequence point at a higher level.
  (editor3_sequence_point): New method.
  (editor3_complete): Also apply a sequence point here.
  (svn_delta__ev3_from_delta_for_commit2): Add the new method in the vtable.

* subversion/libsvn_delta/compat3.c
  (svn_delta__ev3_from_delta_for_commit): Add a null entry in the vtable.

* subversion/libsvn_delta/editor3.c
   wrap_sequence_point): New functions.
  (svn_editor3__get_debug_editor): Add the new method in the vtable.

* subversion/svnmover/svnmover.c
   do_move): Update comments.
  (execute): Apply a sequence point at the beginning of each iteration.

Bert Huijben committed 1661899 (2412 files)
Reviews: none

Create '1.9.x-db-verify' branch as a starting point for backporting
several db stability fixes.

* build/transform_sql.py (Partial of r1660742)
  Make IS_STRICT_DESCENDANT_OF() usable between db columns

* build.conf (r1660874)
  (svn-wc-db-tester): New tool.
  (__MORE__): Add svn-wc-db-tester and x509-parser.
  (x509-parser): Add description.

* subversion/include/private/svn_sqlite.h (r1660659)
  (svn_sqlite__func_t): Update prototype.

* subversion/libsvn_subr/sqlite.c (r1660610, r1660641, r1660659, r1661890)
  (function_wrapper_baton_t): Remove pool.
  (wrapped_func): Update caller. (Different argument type)
  (svn_sqlite__create_scalar_function): Avoid init of state pool.
   svn_sqlite__value_text): Handle different argument type.

* subversion/libsvn_wc/wc-checks.sql (many)
  (STMT_STATIC_VERIFY): Bring up to date with trunk.

* subversion/libsvn_wc/wc-queries.sql (1660758)
  (STMT_SELECT_DELETION_INFO): Use join make query more similar to other cases.
  (STMT_SELECT_DELETION_INFO_SCAN): Remove query that searched for moved
    information in multiple (including wrong) locations.

* subversion/libsvn_wc/wc_db.c
  (scan_deletion_txn): Update statement usage. Only search for moved_to in the
    intended layer. (r1660758)

   svn_wc__db_verify_db_full): New functions. (r1660874)

* subversion/libsvn_wc/wc_db.h (r1660874)
  (svn_wc__db_verify_cb_t): New prototype.
  (svn_wc__db_verify_db_full): New function.

* subversion/libsvn_wc/wc_db_private.h (r1660874)
  (svn_wc__db_verify_db_full_internal): New function.

* subversion/libsvn_wc/wc_db_util.c (r1661890)
  (relpath_depth_sqlite): Update prototype.

* subversion/libsvn_wc/wc_db_wcroot.c (r1660874)
  (verify_sqlite): Rename to...
  (verify_db_cb): ... this. Implement svn_wc__db_verify_cb_t.
  (close_wcroot): Update caller.

* subversion/tests/libsvn_subr/sqlite-test.c
  (error_second): Update argument (r1660659).

* subversion/tests/libsvn_wc/db-test.c
  (TESTING_DATA): Convert sqlite statements to...
   actual_init_data): New variables.
  (create_open): Update caller.
  (validate_abspath): Return svn_error_t * to provide details.
  (*): Minor expectation fixes.

* subversion/tests/libsvn_wc/entries-compat.c (r1660928,1660955,1660961)
  (TESTING_DATA): Convert sqlite statements to...
   actuals): New variables.
  (create_fake_wc): Update callers.
  (test_entries_alloc): Assume a few more nodes, to make db valid.

* subversion/tests/libsvn_wc/op-depth-test.c (r1660587)
  (insert_actual): Ensure that pristine data exists before turning a directory
    in a file.

* subversion/tests/libsvn_wc/utils.c (r1660928)
  (includes): Add token-map.h.
  (svn_test__create_fake_wc): Add support for creating nodes from C structs.

* subversion/tests/libsvn_wc/utils.h (r1660928)
   svn_test__actual_data_t): New structs.
  (svn_test__create_fake_wc): Add arguments.

* subversion/tests/libsvn_wc/wc-queries-test.c (r1660587,1660610)
   test_verify_parsable): New functions, to verify that the verify code is
     accepted by sqlite.
  (test_funcs): Add test_verify_parsable.

* subversion/tests/libsvn_wc/wc-test-queries.sql (r1660587)
  (STMT_NODES_SET_FILE): Really turn a directory into a file.

subversion 1.9.x-db-verify
Julian Foad committed 1661726 (2 files)
Reviews: none

Tweak documentation following r1659863.

* subversion/include/svn_repos.h
  (svn_repos_get_commit_editor5): Document that commit_info.repos_root is
    null. Tweak @since to make another change more visible.

* subversion/libsvn_repos/commit.c
  (invoke_commit_cb): Adjust comment.

Bert Huijben committed 1660874 (7 files)
Reviews: none

Make it easier to run the sql static verifications on a working copy
by creating a private api and adding a small helper tool using this

If you need a typical example you could use
$ svn-wc-db-tester svn-test-work/libsvn_wc/db-test/test_getting_info
J/J-e (depth=2) DBV0061: Moved to without target
K/K-b (depth=1) DBV0061: Moved to without target
svn-wc-db-tester: E155035: Found one or more potential wc.db inconsistencies

* build.conf
  (svn-wc-db-tester): New tool.
  (__MORE__): Add new tools.
  (x509-parser): Add description.

* subversion/libsvn_wc/wc-checks.sql
  (STMT_STATIC_VERIFY): Extend. Separate id from message to support api.

* subversion/libsvn_wc/wc_db.c
   svn_wc__db_verify_db_full): New functions.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_verify_cb_t): New typedef.
  (svn_wc__db_verify_db_full): New function.

* subversion/libsvn_wc/wc_db_private.h
  (svn_wc__db_verify_db_full_internal): New function.

* subversion/libsvn_wc/wc_db_wcroot.c
  (verify_sqlite): Rename to...
  (verify_db_cb): ... this. Implement svn_wc__db_verify_cb_t.
  (close_wcroot): Update caller.

* tools/dev/wc-ng/svn-wc-db-tester.c
  New file, based on the svnraisetreeconflict code.

Bert Huijben committed 1659863 (5 files)
Reviews: none

Fill in the repository root in the commit info when creating it, instead of
relying of a fixup that calls back into the ra layer from an ra layer

* subversion/libsvn_ra/ra_loader.c
   remap_commit_callback): Move to libsvn_ra_local/ra_plugin.

   svn_ra__get_commit_ev2): Remove unneeded call.

* subversion/libsvn_ra_local/ra_plugin.c
   remap_commit_callback): Move here.

   svn_ra_local__get_commit_ev2): Add call to remap_commit_callback.

* subversion/libsvn_ra_serf/merge.c
  (svn_ra_serf__run_merge): Set repository root.

* subversion/libsvn_ra_svn/client.c
  (ra_svn_end_commit): Set repository root.

* subversion/libsvn_repos/commit.c
  (invoke_commit_cb): Document that we don't set repository root.

Ivan Latysh committed 1658696 (1 file)
Reviews: none

Refactor code a bit.

* subversion/libsvn_delta/compat.c
  (alter_file_cb): Inverse condition to avoid negation.