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

Changeset 1709791 is being indexed.

On the 'move-tracking-2' branch: Make branch txn methods return branch state

objects instead of branch ids.

* subversion/include/private/svn_branch.h,





svn_branch_txn_branch): Output a branch state object instead of a branch


* subversion/libsvn_delta/branch_private.h


branch_txn_v_branch_t): Same.

* subversion/libsvn_delta/branch_nested.c


nested_branch_txn_branch): Same.

* subversion/libsvn_delta/compat3e.c


editor3_branch): Adjust callers.

On the 'move-tracking-2' branch: Allow an output pointer to be null.

* subversion/libsvn_delta/branch_nested.c

(nested_branch_txn_branch): Allow the output pointer to be null.

On the 'move-tracking-2' branch: Fix a bug introduced in r1709777.

* subversion/libsvn_delta/branch.c

(branch_txn_open_branch): Ensure the new branch id output is always

provided (if requested), by avoiding an early return.

On the 'move-tracking-2' branch: Allow an output pointer to be null.

* subversion/libsvn_delta/branch.c


branch_txn_branch): Allow the output pointer to be null.

In FSX, block FSFS changes from merges that updated both backends already.

* subversion/libsvn_fs_x

(svn:mergeinfo): Block :r1654932,1654934,1654937,1655635,1655664,1662668,





1702600,1703237,1705638 and 1705643.

On the 'move-tracking-2' branch: Re-apply a fix made in r1708949 and lost in


* subversion/libsvn_delta/branch.c

(branch_txn_open_branch): Don't assert what isn't always true.

On the 'move-tracking-2' branch: Add error checking.

* subversion/libsvn_delta/branch.c

(branch_txn_branch): Add error checking.

On the 'move-tracking-2' branch: Refactoring: Move the handling of nested

branches into a branch txn class that wraps a basic branch txn class.

* subversion/include/private/svn_branch_nested.h

(svn_nested_branch_txn_create): New.

* subversion/libsvn_delta/branch_nested.c

(branch_in_rev_or_txn): Move here from compat3e.c.


svn_nested_branch_txn_create): New.




nested_branch_txn_sequence_point): New, with implementations moved from


* subversion/libsvn_delta/compat3e.c

(branch_in_rev_or_txn): Move to branch_nested.c.




editor3_sequence_point): Move implementations to branch_nested.c, and

instead wrap a nested-branch-txn object around the plain txn.

On the 'move-tracking-2' branch: Refactoring of branch state and branch

transaction objects to allow implementing different subclasses with

different private data.

Make generic class constructors that subclasses can re-use.

* subversion/include/private/svn_branch.h,



svn_branch_state_create): Turn this into a 'base class' contructor.


branch_state_create): Let this be the constructor for the specific


Adjust all callers.

In FSX, block recent FSFS stats and load-index-related changes from merges.

FSX doesn't have that functionality.

* subversion/libsvn_fs_x

(svn:mergeinfo): Block r1674400,1681966,1697381,1697387,1697393,1697403,


1707988 and 1707989.

Merge recent FSFS index.c-related changes to FSX and fix a few conflicts.

This merges the revisions r1652076, 1652441, 1657978 and 1697372.

Follow-up to r1709621 fixing compilation.

* subversion/libsvn_fs_x/cached_data.c

(svn_fs_x__get_proplist): Add missing ERR declaration and fix the

ID stringification calls.

* subversion/libsvn_fs_x/transaction.c

(get_txn_proplist): Add missing ERR declaration and fix the error


Merge recent FSFS lock.c changes to FSX and fix a few conflicts.

This merges the revisions r1652068, 1657525, 1659212, 1659217,1659314

and 1678718.

Follow-up to r1709614.

* subversion/libsvn_fs_x/verify.c

(svn_fs_x__verify): Replace a few FSFS identifiers that slipped through.

Also remove a now unused local variable.

Merge recent FSFS verify.c changes to FSX and fix a few conflicts.

This merges the revisions r1649590, 1665854, 1667538, 1683553 and 1693886.

In FSX, block FSFS changes from merges that updated both backends already.

* subversion/libsvn_fs_x

(svn:mergeinfo): Block r1651567,1659509,1665318,1665894,1667101,1669746,




In FSX, block recent FSFS revprop-related changes from merges.

FSX already provides an improved version of the same functionality.

* subversion/libsvn_fs_x

(svn:mergeinfo): Block r1707971-1707973,1707986,1707988-1707989.

Replicate r1708004 from FSFS in FSX.

This provides a minor FS verification speedup.

* subversion/libsvn_fs_x

(svn:mergeinfo): Update.

* subversion/libsvn_fs_x/verify.c

(verify_revprops): Invalidate the revprop generation only once and then

use it as read-ahead buffer.

Make svn-bench null-log actually evaluate the --with-no-revprops option.

* subversion/svnbench/null-log-cmd.c

(svn_cl__null_log): Explicitly request 0 revprops when no-revprops has

has been set.

Following up on r1349699, make the windows testrunner capable of setting up

httpd for running tests over https, just like the *nix scripts can.

* subversion/tests/cmdline/svntest/

(trust_ssl_cert): Write file as binary to fix byte lengths stored in the



(imports): Import re.

(): Add --https option. Update url calculation.

(Httpd): Add two arguments to allow setting up ssl. Calculate extra paths.

Create certfiles if needed. Write additional config lines.

(Httpd._create_cert_files): New function.

(): Set certfile if we setup the server with our own cert.

On the 'move-tracking-2' branch: Refactoring of branch state and branch

transaction objects to allow implementing different subclasses with

different private data.

This separates the private data from the (conceptually public) vtable.

* subversion/include/private/svn_branch.h


svn_branch_state_vtable_t): New.


svn_branch_state_t): Add a vtable.

* subversion/libsvn_delta/branch_private.h


svn_branch_state_vtable_t): Rename from '*_priv_t' and remove the private


* subversion/libsvn_delta/branch.c


svn_branch_state_priv_t): Define here, containing just the private data.





branch_txn_create): Track the rename of 'priv' to 'vtable'.

(svn_branch_txn_create): Initialize the new 'priv' member.





branch_state_create): Track the rename of 'priv' to 'vtable'.

(svn_branch_state_create): Initialize the new 'priv' member.

* subversion/po/it.po:

* subversion/po/ja.po:

* subversion/po/ko.po:

* subversion/po/zh_TW.po:

Remove trailing ^M introduced in r1709389, it may be the cause of the

Solaris buildbot failure.

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

(enhancements): Add section apache-cache-status.

* STATUS: Propose fix for display of mod_dav_svn cache statistics.
* subversion/mod_dav_svn/status.c: Add missing include so that

conditional code to show process ID gets enabled on Unix.

On the 'move-tracking-2' branch: catch up to trunk@1709537.
    • ?
    • ?
  1. … 25 more files in changeset.
* STATUS: Cast vote. Add nomination.
Apply translation fixes supplied by the debian maintainer.

Resolves one mismatch in all languages where we changed a bit

of witespace and adds one french translation item.

* subversion/po/es.po

* subversion/po/fr.po

* subversion/po/it.po

* subversion/po/ja.po

* subversion/po/ko.po

* subversion/po/nb.po

* subversion/po/pl.po

* subversion/po/pt_BR.po

* subversion/po/sv.po

* subversion/po/zh_CN.po

* subversion/po/zh_TW.po

Tweak commit notifications.

Patch by: James McCoy <jamessan{_AT_}>


Restore the 1.8 behavior of svn_fs_contents_changed() and _props_changed()

API. Switch all calling sites of the new API, svn_fs_contents_different()

and _props_different(), back to using the old functions.

There are no user-visible problems associated with the old code. The new

API doesn't improve any real use cases in the current code, but is causing


- We had a problem with misbehaving svn blame -g

(, "Blame behaviour

change in 1.9").

- We have an issue with repositories behaving differently in client-side

operations like 'svn log' after dump/load

(, "No-op changes no

longer dumped by 'svnadmin dump' in 1.9"; also see issue #4598 in

- We could experience same problems originating from other callers of the

new API, because the low level behavior change associated with switching

to it propagates up to higher levels like svn_repos or svn_ra and alters

the behavior of many different callers like svn_ra_get_file_revs2() or

the update reporter. Third-party API callers could not be ready for it

as well, because public API functions like svn_ra_get_file_revs2() didn't

receive an erratum or a bump.

See the discussion in

("Re: No-op changes no longer dumped by 'svnadmin dump' in 1.9").

* subversion/libsvn_fs_base/dag.c

(svn_fs_base__things_different): Compare the uniquifiers, as we did in 1.8.

* subversion/libsvn_fs_base/fs.h

(node_revision_t.data_key_uniquifier): Remove the comment about not using

this field.

* subversion/libsvn_fs_fs/fs_fs.c

(svn_fs_fs__noderev_same_rep_key): Reintroduce this helper function.

(svn_fs_fs__file_text_rep_equal, svn_fs_fs__prop_rep_equal): Always

assume the strict mode in these helpers.

* subversion/libsvn_fs_fs/fs_fs.h

(svn_fs_fs__noderev_same_rep_key): Declare this re-added helper.

(svn_fs_fs__file_text_rep_equal, svn_fs_fs__prop_rep_equal): Update the

docstrings for these helper functions.

* subversion/libsvn_fs_fs/dag.c

(svn_fs_fs__dag_things_different): Preserve the current comparison behavior

in strict mode. Restore the 1.8 way of comparing the representation keys

in non-strict mode.

* subversion/libsvn_fs_fs/tree.c

(merge): Restore the 1.8 way of comparing property lists.

* subversion/libsvn_fs_fs/fs.h

(representation_t.uniquifier): Remove the comment about not using this


* subversion/libsvn_repos/delta.c

(delta_proplists): Switch back to using svn_fs_props_changed().

(svn_repos__compare_files): Restore this function to its 1.8 state.

(delta_files): Restore the 1.8 way of comparing files.

* subversion/libsvn_repos/dump.c

(dump_node): Switch back to using svn_fs_contents_changed() and


* subversion/libsvn_repos/reporter.c

(delta_proplists): Switch back to using svn_fs_props_changed().

* subversion/libsvn_repos/rev_hunt.c

(send_path_revision): Switch back to using svn_fs_contents_changed().

Remove the no longer necessary hack for svn blame -g with older clients.

* subversion/include/svn_ra.h

(svn_ra_get_file_revs2): Update @note in the docstring.

* subversion/include/svn_repos.h

(svn_repos_get_file_revs2): Update @note in the docstring.

* subversion/tests/cmdline/

(dump_no_op_change): No longer fails with fsfs and bdb.

Fix test suite to consistenly apply FS configuration settings when

creating new repos. This fixes the FSX tests.

* subversion/tests/svn_test_fs.c

(svn_test__create_fs2): Apply the same config when reopening a FS

that we used to create it. That includes

cache settings, for instance.