subversion

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

Changeset 1785319 is being indexed.

Fix design bug in svn_client_list4()/svn_ra_list()/svn_repos_list() APIs.

* subversion/include/svn_client.h (svn_client_list4):

Make the patterns array const. All dependencies and references updated.

* subversion/include/svn_ra.h (svn_ra_list): Likewise.

* subversion/include/svn_repos.h (svn_repos_list): Likewise.

* subversion/libsvn_client/list.c

(list_externals, list_internal, match_patterns,

get_dir_contents, list_external_items, svn_client_list4):

Make patterns array const.

* subversion/libsvn_ra/ra_loader.h (svn_ra__vtable_t::list): Likewise.

* subversion/libsvn_ra/ra_loader.c (svn_ra_list): Likewise.

* subversion/libsvn_ra_local/ra_plugin.c (svn_ra_local__list): Likewise.

* subversion/libsvn_ra_svn/client.c (ra_svn_list): And again.

* subversion/libsvn_repos/list.c (matches_any, do_list, svn_repos_list):

And some more of the same.

Remove warning -Wmissing-variable-declarations in svnconflict.

* tools/client-side/svnconflict/svnconflict.c

(svnconflict_options, svnconflict_global_options, svnconflict_cmd_table):

Move global variables to static scope.

In FSFS, explictly disable rep-sharing for directory representations.

Until now, directory reps would not be added to the rep-cache in any case

but we would still allow for other reps to replace a given new directory.

That was a mere side-effect of using the same code for directories as for

property hashes. Now, we explicitly prevent rep-sharing even the rare

edge-case where a directory hash might accidentally match some file or

prop representation.

* subversion/libsvn_fs_fs/transaction.c

(write_container_rep,

write_container_delta_rep): Add option to disable explictly rep-sharing.

(write_final_rev): Update caller, explicitly disabling rep-sharing for

directories.

* hook-scripts/reject-known-sha1-collisions.sh: Add placeholders for

grep and sed; these are not at the same absolute paths everywhere.

Advertise using the __MORE__ project for Windows builds (which got introduced

already in SVN 1.8) so to make sure that anybody follwing the installation

instructions also gets access to tools like the svn-mergeinfo-normalizer or

svnconflict.

* INSTALL:

(E.4): replace target project __ALL_TESTS__ with __MORE__

* tools/hook-scripts/reject-known-sha1-collisions.sh

Use a more portable syntax for the [(1) (test(1)) tool.

Handle filenames with literal backslashes.

Patch by: danielsh

* tools/hook-scripts/reject-known-sha1-collisions.sh: Skip directories

while looking for the known 320 byte prefix. Fixes a problem where

the hook failed if a directory was encountered in the transaction:

svn: E165001: Commit blocked by pre-commit hook (exit code 3) with output:

svnlook: E160017: Path 'some-dir' is not a file

known SHA-1 collision rejected

* hook-scripts/reject-known-sha1-collisions.sh: Anchor sed regex at beginning

of the line. This is not important since svnlook's output is unlikely to

change but helps clarify our intent of what sed should be matching.

* tools/hook-scripts/reject-known-sha1-collisions.sh: Fix support for paths

with spaces again. Make script easier to use on systems where GNU coreutils

are not installed in /usr/bin.

Revert r1784367 which turned out not to be a correct fix.

[ Note from the future:

Reverted in r1784368; correct fix committed in r1784375 ]

* tools/hook-scripts/reject-known-sha1-collisions.sh:

Support filenames with spaces.

Found by: danielsh

* tools/hook-scripts/reject-known-sha1-collisions.sh: Fix typos in comment.

Follow-up to r1784336, fix variable not defined until later

* tools/hook-scripts/reject-known-sha1-collisions.sh:

Remove copy-pasto

Found by: gstein

Add pre-commit hook script that can reject known SHA-1 collisions

* tools/hook-scripts/reject-known-sha1-collisions.sh:

Script tested on Linux, OpenBSD

* tools/client-side/svnconflict/svnconflict.c

(check_lib_versions): Remove indirectly linked libs. Fixes Window build.

Found by: luke1410

* publish/docs/release-notes/1.10.html:

(#conflict-resolver): generalize local change "delete directory" to

"delete item".

* build.conf

(__MORE__): Remove reference to not existing 'svnauth' library/application.

Note that svnauthz is properly referenced in other places.

* release-notes/1.10.html: Add a few client- and server-side enhancments.

This section of the release notes is far from complete.

Tagging release 1.10.0-alpha2
* CHANGES: Remove r1685085 from 1.10 section. It was merged to 1.9.x.

* CHANGES (1.10.0): Drop the r1718267 entry. This change fixes CVE-2015-5259

and has been released in Apache Subversion 1.9.3.

Stop recommending resolution options which follow incoming moves for merges.

It makes sense for update and switch. If merging, however, the user may want

to apply an incoming edit to the node's old location, e.g. when backporting

a file edit to an older release branch where the move should not be applied.

Recommending that the move be applied without user interaction is not helpful

in such a case. Instead, the resolver should offer two options:

apply the move + edits, or apply edits at the old location.

The latter option is not yet implemented.

* subversion/libsvn_client/conflicts.c

(init_wc_move_targets): Only recommend options which follow incoming moves

for conflicts raised by update and switch operations.

* CHANGES (1.10.0): Fix several typos.

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

(authzperf): Fix typos.

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

(authzperf): Another formatting tweak.

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

(authzperf): eliminate some unnecessary line breaks

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

(#authzperf): Fill in some details.

Rename our debug helpers, svn_hash__gets() and svn_hash__sets() to make

them visually different from the svn_hash_gets() and svn_hash_sets()

macros.

These functions are only used in conjunction with SVN_DEBUG to gain

additional type safety, and should not be used by themselves in the

production code.

* subversion/include/svn_hash.h

(svn_hash__gets, svn_hash__sets): Rename to ...

(svn_hash__gets_debug, svn_hash__sets_debug): ...this.

(svn_hash_gets, svn_hash_sets): Update these macros.

* subversion/libsvn_subr/hash.c

(svn_hash__gets, svn_hash__sets): Rename to ...

(svn_hash__gets_debug, svn_hash__sets_debug): ...this.

Following up on r1777345, unbreak build of the svn-mergeinfo-normalizer

tool on Windows.

* tools/client-side/svn-mergeinfo-normalizer/wc_mergeinfo.c

(svn_min__sibling_ranges): Call svn_hash_sets() instead of svn_hash__sets()

that is only defined with SVN_DEBUG.

* publish/docs/release-notes/1.10.html: put "keep working copy state" as

resolution option for local change "deleted directory".