subversion

Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1410454 is being indexed.

* src/subversion/subversion/include/svn_wc.h

(svn_wc_parse_externals_description3): Doc fix to clarify relative URLs.

Suggested by: neels

(Discussed at inappropriate length in IRC with neels, julianf, breser.)

* subversion/tests/cmdline/copy_tests.py

(copy_added_dir_with_copy): Extend to explictly test mv as well as cp.

Fix a crash introduced in r1241718: When we've got a txdelta against

a PLAIN representation, we must use the latter as source buffer for

the txdelta chain and instead of assuming an empty window.

* subversion/libsvn_fs_fs/fs_fs.c

(read_delta_window): renamed from read_window

(read_plain_window): new function; read data from PLAIN representation

(get_combined_window): if we don't start from a cached combined window,

check for a PLAIN start representation and read from it as necessary

(delta_read_next_window): update caller

Test for another logic error in txdelta usage (development check only).

* subversion/libsvn_delta/text_delta.c

(svn_txdelta_apply_instructions): test that sbuf in not NULL when we

actually need a source buffer

Although we (de)compress binary data, we should 0-terminate the

output buffers as required by svn_stringbuf_t's invariants.

* subversion/libsvn_delta/svndiff.c

(zlib_encode,

zlib_decode): 0-terminate output buffer after (de)compression

* subversion/libsvn_fs_fs/fs_fs.c

(rep_write_cleanup): Improve a comment, no functional change.

Suggested by: danielsh

Fix breakage of the test suite after adding http proxy support.

* subversion/tests/cmdline/svntest/main.py

(_create_parser): Add --http-proxy argument support.

Make it easy to run the test suite through an http proxy.

* Makefile.in

(check): Convert HTTP_PROXY to --http-proxy arg on run_tests.py

* build/run_tests.py

(usage): Add --http-proxy as a possible option.

(TestHarness.__init__): Add http_proxy arg / attribute on class.

(TestHarness._run_py_test): Pass in http_proxy attribute.

(main): Support parsing --http-proxy, pass value to TestHarness constructor.

* subversion/tests/cmdline/svntest/main.py

(create_config_dir): Accept a http_proxy arg, use urlparse to split it as

though it was netloc of a URL. This allows ipv6 addresses via the

[ipv6]:port syntax. Add the split argument as http-proxy-host and

http-proxy-port in the servers config file.

(TestSpawningThread.run_one): Pass the --http-proxy arg.

(execute_tests): Pass http_proxy to create_config_dir.

STATUS: Add r1410106 to 1.6.x-rep_write_cleanup proposal.

On the 1.6.x-rep_write_cleanup branch, merge r1410106 from trunk.

No conflicts, clean merge.

* STATUS: Add r1410106 to r1403964 & r1403982 proposal.

Try all the cleanup steps even if there are failures in the earlier steps.

As things stand right now if there is an error in the file trunc or close

then we will still not cleanup the being_written flag. The consequences of

the trunc or close not happening are very small. If the trunc does not happen

then there will be a garbage representation left in the protorev file, which

does not break anything functionally. The close has no issues I can think of

since the pool it's opened in is about to be destroyed anyway.

* subversion/libsvn_fs_fs/fs_fs.c

(rep_write_cleanup): compose all the errors of all the steps returning the

first error if any.

On the 'tree-read-api' branch: a bit of renaming.

* subversion/include/svn_tree.h

(svn_tree_node_read_dir): Rename 'dirents' to 'children' for consistency.

* subversion/libsvn_subr/tree.c

(walk_tree): Same.

Make svn_wc_copy3() and svn_wc__move2() check that they have been called

with the write lock(s) required by the doc string, like some other WC

functions do. Fix op-depth-test.c to acquire the write lock before calling

svn_wc_copy3().

* subversion/libsvn_wc/copy.c

(svn_wc_copy3, svn_wc__move2): Check we have the required write lock(s).

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

(wc_copy): Acquire a write lock before calling svn_wc_copy3().

(wc_wc_copies): Use wc_copy() instead of calling svn_wc_copy3() directly.

* subversion/tests/cmdline/externals_tests.py

(duplicate_targets): Blind attempt to fix windows buildbot.

* subversion/tests/cmdline/svntest/factory.py: special config for 'svn pg'.

* subversion/tests/cmdline/merge_automatic_tests.py

(subtree_to_and_fro): Link to issue #4258 that I filed to track this.

* CHANGES: Wrap to 80 columns.
* subversion/tests/cmdline/externals_tests.py (duplicate_targets):

Fix on windows.

Implement issue #4227: Externals: Multiple definitions for the same path;

limitation: only check for duplicates within the same svn:externals prop.

* subversion/libsvn_wc/externals.c

(svn_wc_parse_externals_description3):

Return an error when DESC contains the same WC target twice (or more). For

that purpose, always compose the list of items, regardless of whether it

will be returned or not. Side effect: if EXTERNALS_P is nonzero, and if

parsing of DESC returns an error,

* subversion/tests/cmdline/externals_tests.py

(duplicate_targets): New test for above.

* subversion/tests/cmdline/svntest/factory.py: tweak, add abs_wc_dir var.
Move the single test in libsvn_wc/externals-test.c over to

libsvn_client/client-test.c (and simplify).

* subversion/tests/libsvn_wc/externals-test.c,

* build.conf:

Remove externals-test.c

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

(test_externals_parse_erratic, test_funcs): New test.

Suggested by: rhuijben

* /subversion/README

Update the top-level directory listing and descriptions, and massage

the `EDITING THE HISTORY' section a bit for flow and readability.

Follow-up to r1409852.

* subversion/tests/libsvn_wc (svn:ignore): Add 'externals-test'.

Make svn_wc_parse_externals_description3 behave as described.

* subversion/libsvn_wc/externals.c (svn_wc_parse_externals_description3):

If DESC is invalid, really do not touch *EXTERNALS_P, as advertised in

include/svn_wc.h.

* subversion/tests/libsvn_wc/externals-test.c,

* build.conf (externals-test, __ALL_TESTS__):

Add new test for above.

    • ?
    /trunk/subversion/tests/libsvn_wc/externals-test.c
Fix failing autoprop_tests.py 28 on *nix.

* subversion/tests/cmdline/autoprop_tests.py

(svn_prop_inheritable_autoprops_add_versioned_target): Reset executable

bits after first add, so subsequent revert & adds don't set svn:executable

simply because the file has the executable bits set.

Nominate r1409804.
Add a delimiter between concatenated error chains.

* subversion/libsvn_subr/error.c

(svn_error_compose_create): Add a human-readable delimiter between the two

chains. (Do we need to make it machine-readable, i.e., having its own

error code?)

* subversion/libsvn_client/list.c

(svn_client__ra_stat_compatible): Avoid theoretical null reference, when the

ra session root disappeared during the call to this function.

* subversion/libsvn_client/client.h

(svn_client__ra_stat_compatible): Update comment a bit.