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

Changeset 1660569 is being indexed.

* build/generator/

(write): Don't prepend $(SolutionDir) before absolute paths.

Create backport branch for an issue building neon
Remove the '1.8.x-r1590751' branch, merged in r1660562.
Merge the 1.8.x-r1590751 branch:

* r1590751, r1660350

Use empty, rather than NULL, config if default is unreadable.


svn SEGV reported by user.


A test case is "HOME=/dev/null svn st".




+1: rhuijben, philip, julianfoad, danielsh

Merge the r1544302 group from trunk:

* r1544302, r1544303

Add HTTPd lock file configuration for testing against HTTPd 2.4+.


Without this change, the davautocheck tests do not work on some

systems where HTTPd 2.4+ is the default; OSX 10.10 is one such case.


As far as I'm concerned, this blocks 1.7.19 and 1.8.11 since the

tests won't run on a current version of a supported OS.


+1: brane, breser, philip

* site/publish/docs/index.html:

Provide links to the 1.9.x pre-release generated documentation.

Update unreleased docs link to 1.10.0.

Update the NOTE about unreleased and prerelease docs.

Increment the trunk version number to 1.10.0-dev.

* subversion/include/svn_version.h: Increment version number.

* subversion/tests/cmdline/svntest/ (SVN_VER_MINOR),

build/ (SVN_VER_MINOR):

Increment version number.

* subversion/bindings/javahl/src/org/apache/subversion/javahl/

(NativeResources.init): Increment required library version.

* branches/1.9.x/STATUS: New file.
Create the 1.9.x release branch.
* INSTALL: Note that BDB is deprecated to discourage usage.

* INSTALL: Remove mentions of RPMs that we don't support anymore.


Remove some outdated Windows specifics.

Building zlib with masm support will give you invalid data, so remove

from file.

* INSTALL: This file is out-of-date in lots of places, fix a few.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_get_file_revs2): Also perform the capability check if start revision

specifies HEAD. Don't use the log fallback when asking for merged

revisions, as that isn't going to work.

* subversion/tests/cmdline/README: Update SASL instructions.

* subversion/tests/libsvn_wc/entries-compat.c

(TESTING_DATA): Remove unneeded values to make this testset

compatible with the verification code.

Update the test data in db-test.c to at least pass the current static

validations. Add two missing intermediate directories, and remove

values that shouldn't be set.

* subversion/libsvn_wc/wc-checks.sql

(STMT_STATIC_VERIFY): Add column for op-depth value to queries.

* subversion/libsvn_wc/wc_db_wcroot.c

(verify_sqlite): Update usage.

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

(TESTING_DATA): Tweak values to set columns NULL that should be NULL.

(test_children): Update expected results.

(test_working_info): Update expected results.

Make the pre-1.7 import code not write values into wc.db NODES columns that the

presence implies shouldn't be written.

* subversion/libsvn_wc/entries.c

(includes): Add token-map.h.

(insert_node): Don't write values that shouldn't be set.

* subversion/tests/libsvn_wc/op-depth-test.c

(test_db_make_copy): Fix invalid static test data. base-deletes don't

have repository locations.

Stop storing values in columns of NODES rows where their presence implies that

they shouldn't have those values, in the few code paths that still added them.

* subversion/libsvn_wc/wc-checks.sql

(STMT_STATIC_VERIFY): Extend verifications.

* subversion/libsvn_wc/wc_db.c


insert_working_node): Stop storing depth, properties when the

node has not a present status.

* subversion/tests/libsvn_wc/wc-test-queries.sql

(STMT_INSERT_NODE): Don't add values invalid for this presence.

Rename an op-depth test called after its previous wc_db name to its

current name.

* subversion/tests/libsvn_wc/op-depth-test.c

(temp_op_make_copy): Fold into its only caller.

(test_temp_op_make_copy): Rename to...

(test_db_make_copy):... this and integrate temp_op_make_copy.

(test_funcs): Update reference.

* STATUS: Vote. Wrap to 80 columns.
* subversion/libsvn_wc/wc_db.c

(set_actual_props): Try to delete unneeded ACTUAL_NODE record while we are

still in the sqlite transaction and the page cache contains everything


* subversion/tests/libsvn_wc/entries-compat.c

(TESTING_DATA): Turn 'I' into a file to allow setting a changelist on it

without turning on alarm bells on database consistency.

Improve the way we currently log assertions and malfunctions in mod_dav_svn.

Prior to this changeset we were delegating this to the default malfunction

handler, svn_error_abort_on_malfunction(). If a malfunction happens, this

handler outputs the information about it to STDERR. Apache usually replaces

STDERR with what the ErrorLog directive points to, but there are a couple

of caveats:

- First of all, doing so bypasses existing error log hooks installed via

ap_hook_error_log(). There might be existing installations that happen to

use custom error log hooks as an addition to the main error log or even as

a complete replacement for it — think ErrorLog /dev/null, but with a custom

logging module doing all the work. In the latter case, the information

about the malfunction would be completely lost.

- Secondly, the error message contains an unnecessary "svn:" prefix, and this

is inconsistent with other Subversion errors that can appear in the Apache

error log.

Avoid them by installing a custom malfunction handler. Related discussion

can be found in

(Subject: "Handling assertions and malfunctions in mod_dav_svn")

* subversion/mod_dav_svn/mod_dav_svn.c

(malfunction_handler): New function that logs the malfunction details with

ap_log_error() and aborts the current process.

(init_dso): Install new malfunction_handler in this APR_HOOK_REALLY_FIRST

pre_config hook.

On the svn-info-detail branch: Increase the range of the string

similarity test result and factor the similar-string search out

of svn_cl__check_prop_name into a separate client-local function.

* subversion/include/private/svn_string_private.h

(SVN_STRING__SIM_RANGE_MAX): New; parametrized the similarity range.

(svn_cstring__similarity): Update docstring and adjust return type.

(svn_string__similarity): Adjust return type.

* subversion/libsvn_subr/string.c

(svn_cstring__similarity): Adjust return type.

(svn_string__similarity): Adjust return type. Change the result range.

* subversion/svn/cl.h

(svn_cl__simcheck_context_t): New forward-declared struct.

(svn_cl__simcheck_t): New structure.

(svn_cl__similarity_check): New client-local function.

* subversion/svn/props.c

(simprop_context_t, simprop_t): Removed in favour of the new

svn_cl__simcheck_context_t and svn_cl__simcheck_t.

(simprop_key_diff, simprop_compare): Moved to similarity.c.

(svn_cl__check_svn_prop_name): Use the new similarity check API.

* subversion/svn/similarity.c: New file.

(svn_cl__simcheck_context_t): Defined here.

(simcheck_key_diff): Replaces simprop_key_diff from props.c.

(simcheck_compare): Replaces simprop_compare from props.c.

(svn_cl__similarity_check): Implement.

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

(test_string_similarity): Adjust test case to account for the

changed range of the result of svn_string__similarity.

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

(handle_rev): Following up on r1660463, remove stray SVN_DBG().

Make svn_ra_get_file_revs2() capable of handling SVN_INVALID_REVNUM as head


* subversion/libsvn_repos/rev_hunt.c

(svn_repos_get_file_revs2): Convert invalid revisions to HEAD.

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

(handle_rev): Support bigger range.

(test_file_revs_both_ways): Extend test.

On the svn-info-detail branch: Abstract some common code.

* subversion/svn/info-cmd.c

(relative_url): New; constructs a relative URL.

(print_info_xml, print_info): Call relative_url instead of

maintaining the same logic in two places.

Follow-up to r166043.

* publish/packages.html: Remove UTF8 BOM.