subversion

Checkout Tools
  • last updated 12 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1409738 is being indexed.

* 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.

* subversion/libsvn_client/list.c

(svn_client__ra_stat_compatible): Avoid unneeded work in the common case

where the ra layer supports svn_ra_stat(). Rename some variables.

Use a single copy of a duplicated static function. This makes 'svn info'

report some otherwise unavailable values (such as last author, etc.)

when used against a pre 1.2 svnserve repository root.

* subversion/libsvn_client/client.h

(svn_client__ra_stat_compatible): New prototype.

* subversion/libsvn_client/info.c

(ra_stat_compatible): Remove function.

(svn_client_info3): Update caller. Remove pre-1.2 handling as we can now get

everything we need.

* subversion/libsvn_client/list.c

(ra_stat_compatible): Rename to ...

(svn_client__ra_stat_compatible): ... this and make library public.

Use subpool for temp ra session.

(svn_client_list2): Update caller.

* subversion/libsvn_client/export.c

(window_handler): Compose a possible error instead of ignoring it.

* subversion/libsvn_client/copy.c

(repos_to_repos_copy): Compose abort error instead of just clearing it.

* subversion/libsvn_client/commit.c

(svn_client_import5): Compose abort error instead of directly clearing it.

* subversion/libsvn_client/add.c

(mkdir_urls): Compose errors instead of clearing some.

Match test expectations to reality.

* subversion/tests/cmdline/patch_tests.py

(patch_change_symlink_target): Expect to fail on Windows, too, since it does.

Add a skeleton XFail test. There is no issue number yet, but the bug is being

discussed on users@.

* subversion/tests/cmdline/patch_tests.py

(patch_change_symlink_target): New.

(test_list): Run it.

On the 'tree-read-api' branch:

* subversion/libsvn_subr/tree.c

(walk_two_trees): Remove a wrong assertion that a node can't change kind.

Commit (again) a bit of logic abstraction. The abstraction is only

used from one call site at the moment (making it a somewhat less

valuable abstraction). But I hope to use it elsewhere, too, if I can

ever figure out why the various lists used herein keep getting

corrupted when I try to do so.

* subversion/libsvn_ra_serf/update.c

(report_context_t): Add 'closed_root' flag.

(maybe_close_dir_chain): New helper function with logic cored out of...

(finish_report): ...here. Also, use the new report_context_t

'closed_root' flag instead of the similarly named local variable.

* subversion/libsvn_client/add.c

(svn_client__get_all_auto_props): Use iterpool as scratch pool in two cases.

This reverts r1409186.

* subversion/libsvn_client/prop_commands.c

(svn_client_propget5): Fix scratch/result pool usage.

Begin sketching out the stuff needed to switch the update process over

to the new XML parsing code.

This stuff is disabled with an #ifdef for now. It is just an initial

commit of stuff from my wc, to prevent continued conflicts every time

I update :-P

* subversion/libsvn_ra_serf/update.c:

(enum report_state_e): add more states

(update_ttable): new transition table

(update_opened, update_closed, update_cdata): new xml parsing

callbacks

* subversion/include/svn_client.h:

(svn_client_diff6): Tweak the doc string: don't make it look like

'original path' and 'modified path' are parameters.

In this revision a mass spelling correction OCCURRED (not occured).

* subversion/bindings/javahl/native/Path.cpp,

subversion/bindings/javahl/native/Path.h

(m_error_occured): Rename to 'm_error_occurred'.

(error_occured): Rename to 'error_occurred'.

* subversion/bindings/javahl/native/Targets.cpp,

subversion/bindings/javahl/native/Targets.h

(Targets): Same.

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

Track the renames.

* subversion/bindings/swig/perl/native/Repos.pm

(get_logs): Fix spelling in a doc string.

* subversion/libsvn_subr/cache_config.c

(svn_cache__get_global_membuffer_cache): Fix spelling in a comment.

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

(test_stream_base64_2): Fix spelling in a doc string.

* tools/server-side/svn-backup-dumps.py

(__main__): Fix spelling in printed output.

* contrib/client-side/svnmerge/svnmerge_test.py

(TestCase_TestRepo.testMergeAndRollbackEmptyRevisionRange): Fix spelling

in a doc string.

On the 'tree-read-api' branch: catch up to trunk@1409188.
    • ?
    /branches/tree-read-api/subversion/mod_dav_svn/dav_svn.h
    • ?
    /branches/tree-read-api/subversion/libsvn_client/commit.c
    • ?
    /branches/tree-read-api/subversion/libsvn_ra_svn/client.c
  1. … 30 more files in changeset.
* subversion/libsvn_client/add.c

(svn_client__get_all_auto_props): Don't use iterpool when values must

persist.

* subversion/tests/cmdline/depth_tests.py (verify_depth): Raise correct type.

Add a regression test for issue 4257, neon sometimes adds a spurious

nodes row. This test is a PASS on trunk and a FAIL on 1.7.

* subversion/tests/cmdline/depth_tests.py

(spurious_nodes_row): New.

(test_list): Add new test.

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

(sqlite_stmt): New.

* subversion/libsvn_client/add.c

(add_file): Compose revert error instead of clearing it.

(svn_client__get_all_auto_props): Use iterpool through the entire function

instead of just created and destroyed in an outer loop.

Use do { } while () to avoid several compiler warnings.

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

(SVNClient::doImport): Unbreak compilation. Needs followup to provide access

to this new option from java.

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

(uri_canonical_tests): Following up on r1409146, add a few more test values.

* STATUS: Nominate r1409146
Use svn_uri_get_file_url_from_dirent() function to avoid a path component count

hack.

* subversion/libsvn_ra_local/split_url.c

(includes): Remove path.h

(svn_ra_local__split_URL): Don't split components. Use the documented

apis instead.

Resolve a specific case where calling svn_uri_get_file_url_from_dirent()

doesn't return a canonical uri.

* subversion/libsvn_subr/dirent_uri.c

(svn_uri_get_file_url_from_dirent): Make sure "C:/" returns a canonical url.

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

(test_file_url_from_dirent): Update expected result. Test result for being

canonical.

Fix build on HAVE_SYMLINK platforms.

* subversion/libsvn_client/add.c

(svn_client_add5): Use renamed pool argument that changed in r1409064.

I hadn't caught this on my Windows box.

* site/publish/docs/release-notes/1.8.html

Tweak release notes for 'repos dictated config' to reflect

changes made in r1409064.

Make the --no-ignore and --no-auto-props options disregard the

svn:global-ignores and svn:auto-props properties respectively.

As per the discussion here

http://svn.haxx.se/dev/archive-2012-11/0155.shtml

* subversion/include/svn_client.h

(svn_client_add5): New.

(svn_client_add4): Deprecated.

(svn_client_import5): Add an argument tracking the --no-auto-props option.

* subversion/libsvn_client/add.c

*** Note from the future: Not all The functionality promised

by this commit was made in this change. Specifically,

'svn add --no-ignore' does not disregard svn:global-ignores.

This we rectified in r1418017. ***

(svn_client__get_paths_auto_props): Allow for null AUTOPROPS argument.

(add_file): Add a new argument NO_AUTOPORPS signaling if we want to

consider autoprops or not and set applicable autoprops if we do.

(add_dir_recursive): Add a new argument NO_AUTOPORPS signaling if we

want to consider autoprops or not. Pass it along to recursive calls

and to add_file().

(add): Add a new argument NO_AUTOPORPS signaling if we want to consider

autoprops or not. Pass this arg to add_dir_recursive() and add_file().

(svn_client_add4): Revved to...

(svn_client_add5): ...this. Most of the change here is just the name

change of the POOL arg to SCRATCH_POOL. Functional bit is accepting

the new NO_AUTOPROPS arg and passing it down add().

(svn_client__make_local_parents): Replace call to svn_client_add4 with

svn_client_add5.

* subversion/libsvn_client/client.h

(svn_client__get_paths_auto_props): Better explain what this function does.

* subversion/libsvn_client/commit.c

(import_ctx_t): Note that the autoprops member may be null.

(get_filtered_children): Rename the 'mandatory_ignores' argument to

'global_ignores' since it isn't mandatory anymore. Also handle a null

value for this argument, which which claimed to do already but didn't.

(import_dir): Rename the 'mandatory_ignores' argument to 'global_ignores'.

Add a new argument tracking the --no-auto-props option. Don't grab

the runtime ignores every time we import a dir, rather let the caller

do it once and pass it in as part of the global_ignores.

(import_children): Rename the 'mandatory_ignores' argument to

'global_ignores'. Add a new argument tracking the --no-auto-props

option.

(import): Same as import_dir. Also account for the change to

get_filtered_children.

(svn_client_import5): Add the aforementioned new argument. Either get all

ignores/autoprops or none, as per the --no-ignore and --no-auto-props

options.

* subversion/libsvn_client/deprecated.c

(svn_client_add4): New wrapper around svn_client_add5.

* subversion/svn/add-cmd.c

(svn_cl__add): Use svn_client_add5 instead of svn_client_add4, passing

along the new arg tracking the --no-auto-props option.

* subversion/svn/import-cmd.c

(svn_cl__import): Pass along the new arg tracking the --no-auto-props

option.

* subversion/svn/main.c

(svn_cl__options): Tweak help text for --no-ignore option.

* subversion/tests/cmdline/autoprop_tests.py

(check_inheritable_autoprops,

inheritable_autoprops_test): Adjust to reflect new behavior; we might

have all types of autoprops, just svn:auto-props, or no autoprops at all.

(svn_prop_inheritable_autoprops_add_versioned_target): Expand test to

cover some new scenarios.

* subversion/tests/cmdline/import_tests.py

(import_inherited_ignores): Fix a mistake where a path name pointed to a

non-existent file in the import_tests_data import tree -- this wasn't a

problem with the old behavior because this path was never referenced.

Adjust the test expectations to agree with the new behavior.

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

(test_16k_add): Use latest version of svn_client_add*