subversion

Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1851462 is being indexed.

* build.conf

(libsvn_subr): Following up on r1850611, add new private header to exports.

* subversion/include/private/svn_client_private.h

(svn_client__get_diff_summarize_callbacks): Update doc string, following r1835234.

* subversion/tests/libsvn_fs/locks-test.c (obtain_write_lock_failure):

Add a comment that explains why this test fails when run as root.

No functional change.

* CHANGES: Record r1851333 and reword r1845408.

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.

Fix blame field alignment, following r1851265,r1851268.

* subversion/svn/blame-cmd.c

(blame_baton_t,

blame_receiver): Move the field width calculation back to here,

(svn_cl__blame): after having over-enthusiastically moved it to here where

it wasn't calculated until after all the output was printed.

In shelving code: lock the whole WC when unshelving.

The immediate benefit is code simplification rather than functional.

* subversion/libsvn_client/shelf.c

(wc_file_merge,

wc_dir_props_merge,

wc_node_delete,

wc_node_add): Don't lock the WC here...

(svn_client__shelf_apply): ... but here.

Move misplaced parameters out of the blame callback.

Part 2 of a commit started in r1851265.

* subversion/include/svn_client.h,

subversion/libsvn_client/blame.c

(svn_client_blame6): Move the start/end parameters from

svn_client_blame_receiver4_t to svn_client_blame6().

* subversion/libsvn_client/deprecated.c

(blame_receiver_wrapper_baton3,

blame_wrapper_receiver3,

svn_client_blame5): Adjust the compatibility wrapper.

Move misplaced parameters out of the blame callback.

The svn_client_blame_receiver4_t parameters "start_revnum" and "end_revnum"

do not really belong here because they are not per-line data. They are the

"resolved" versions of the input revnums to svn_client_blame6(). This patch

moves them to svn_client_blame6() output parameters.

* subversion/bindings/javahl/native/BlameCallback.h,

subversion/bindings/javahl/native/BlameCallback.cpp

(callback,

singleLine): Drop the start/end parameters.

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

(blame): Adjust the call to svn_client_blame6(). Don't provide access to

the start/end parameters here, as we weren't providing access to them

through the callback. We could add them later.

* subversion/svn/blame-cmd.c

(blame_receiver_xml,

blame_receiver): Don't expect and process start/end revnums here.

(svn_cl__blame): Handle them here instead.

Update callers to use the newly revved svn_client_blame6() API.

* subversion/bindings/javahl/native/BlameCallback.h,

subversion/bindings/javahl/native/BlameCallback.cpp

(callback,

singleLine): Expect 'svn_string_t *' instead of 'char *'.

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

(blame): Update the call to use svn_client_blame6.

* subversion/svn/blame-cmd.c

(blame_receiver_xml,

blame_receiver): Expect 'line' to be an svn_string_t.

(svn_cl__blame): Update to use svn_client_blame6 and

svn_client_blame_receiver4_t.

* subversion/include/svn_client.h

(svn_client_blame_receiver4_t): Improve doc string.

* subversion/include/svn_client.h

(svn_client_blame_receiver4_t): improve the doc string

Programming style fixes; no functional change.

* subversion/libsvn_client/upgrade.c (upgrade_externals_from_properties):

- Rename 'iterpool2' to 'inner_iterpool' to give readers a bit of a semantic

nudge about its intended use. Also destroy it before the outer iterpool.

- Move the initialization of externals_parent_url to the point where

we actually need it, avoiding potentially misleading identical conditional

statements.

Found by: David Binderman

(See: https://lists.apache.org/thread.html/02a7cc6a552027fa340428d3dd1781a50024ef18009008e586c7b502@%3Cusers.subversion.apache.org%3E)

* COMMITERS: Add myself as a partial commiter (swig-py3 branch)

* publish/docs/release-notes/index.html

(upcoming-patch-release): Tiny wording tweaks.

* publish/docs/release-notes/index.html

(upcoming-patch-release): Improve the description. Link to the generator script.

Announce Subversion 1.9.10, 1.10.4, 1.11.1.
* upcoming.part.html: Automatically regenerated
* COMMITTERS: Move myself to the full committer section.

* subversion/libsvn_client/util.c

(svn_client__pathrev_create_with_session): Assert that the session

matches the URL.

Follow-up to r1850913:

* staging/docs/community-guide/releasing.part.html

(#tarball-signing): Track URL change.

* staging/docs/community-guide/releasing.part.html

(tarball-signing): Fix public key list url.

* tools/dev/unix-build/Makefile.svn: Stop compiling httpd in maintainer mode

for now. APR gets some _FMT_T constants for 64 bit types wrong on OpenBSD,

and this leads to many format string warnings which make httpd 2.4's build

fail due to -Werror. Non-maintainer mode builds don't force -Werror, so this

works around the problem until the underlying APR issue has been addressed.

* tools/dev/unix-build/Makefile.svn: Remove mod-proxy diff during httpd-clean.

* tools/dev/unix-build/Makefile.svn: Apply a patch to make mod_proxy build

without APR threads in httpd 2.4.

* tools/dev/unix-build/Makefile.svn: OpenBSD's JDK no longer supports dlopen()

of shared objects which do not end in '.so' because a local patch to load

objects with versioned names was dropped from OpenBSD's ports tree during an

update of the JDK. Work around this by manually symlinking libsvnjavahl.so.

* upcoming.part.html: Automatically regenerated
* subversion/bindings/cxx/src/client_status.cpp

(status, async::status): Move closer to the almost-always-auto style.

* subversion/bindings/cxx/include/svnxx/client/status.hpp

(client::async::status): Tweak wording in the docstring.

* subversion/bindings/cxx/include/svnxx/detail/future.hpp

(shared_future::shared_future,

future::future): Fix -Wshadow warning from gcc.