subversion

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

Changeset 873410 is being indexed.

Python 3 compatibility:

Try to import configparser module.

(ConfigParser was renamed to configparser.)

* build/generator/gen_base.py:

* build/generator/gen_make.py:

* build/generator/swig/__init__.py:

* build/win32/make_dist.py:

* gen-make.py:

* tools/hook-scripts/mailer/mailer.py:

* win-tests.py: Try to import configparser module.

Python 3 compatibility:

Update calls to print() in 'build' directory, 'gen-make.py' and 'win-tests.py'.

* build/generator/extractor.py:

* build/generator/gen_win.py:

* build/generator/swig/checkout_swig_header.py:

* build/generator/swig/external_runtime.py:

* build/generator/swig/header_wrappers.py:

* build/get-py-info.py:

* build/getversion.py:

* build/run_tests.py:

* build/strip-po-charset.py:

* build/win32/make_dist.py:

* gen-make.py:

* win-tests.py: Call print() or file.write().

Simplified chinese translation update.

* subversion/po/zh_CN.po: Update to r33329, translate some new strings.

Polish translation update.

* subversion/po/pl.po: Polish translation update.

Simplified chinese translation update on the '1.5.x' branch:

* subversion/po/zh_CN.po: translate new backport strings.

On the 'ctypes-python-bindings' branch:

Python 3 compatibility:

Don't use 'has_key'.

* csvn/txn.py

(Txn._check_path, _txn_operation.open): Use 'in' instead of 'has_key'.

On the 'svnpatch-diff' branch:

Merge r33157:33329 from trunk.

  1. … 154 more files in changeset.
* subversion/include/svn_base64.h

(svn_base64_from_checksum): Followup to r33328: Fix docstring.

Found by: arfrever

More checksum API updating.

* subversion/libsvn_subr/svn_base64.c,

subversion/include/svn_base64.h

(svn_base64_from_checksum): New.

(svn_base64_from_md5): Deprecate.

* subversion/libsvn_subr/checksum.c,

subversion/include/svn_checksum.h

(svn_checksum_size): New.

Delete svn_sha1_*() from public API.

* subversion/include/svn_sha1.h: Rename to ...

* subversion/libsvn_subr/sha1.h: ... this.

* subversion/libsvn_subr/sha1.c

(svn_sha1__empty_string_digest_array): Renamed from

svn_sha1__empty_string_digest.

* subversion/libsvn_subr/sha1.h

* subversion/libsvn_subr/sha1.c

(svn_sha1__empty_string_digest): Renamed from svn_sha1_empty_string_digest().

(svn_sha1__digest_to_cstring_display): Renamed from

svn_sha1_digest_to_cstring_display.

(svn_sha1__digest_to_cstring): Renamed from svn_sha1_digest_to_cstring().

(svn_sha1__digests_match): Renamed from svn_sha1_digests_match().

* subversion/libsvn_subr/checksum.c

(): Include "sha1.h" instead of "svn_sha1.h".

(svn_checksum_match): Call svn_sha1__digests_match() instead of

svn_sha1_digests_match().

(svn_checksum_to_cstring_display): Call

svn_sha1__digest_to_cstring_display() instead of

svn_sha1_digest_to_cstring_display().

(svn_checksum_to_cstring): Call svn_sha1__digest_to_cstring() instead of

svn_sha1_digest_to_cstring().

(svn_checksum_empty_checksum): Call svn_sha1__empty_string_digest() instead

of svn_sha1_empty_string_digest().

* subversion/libsvn_fs_fs/tree.c

(): Don't include "svn_md5.h" and "svn_sha1.h".

    • ?
    /trunk/subversion/libsvn_subr/sha1.h
Issue #2028: add a series of svn_dirent functions, based on the svn_path

equivalents but supporting Windows dirents correctly.

This is a manual marge of a part of r32423 on the windows_dirents branch,

the other changes on that branch will follow.

Adds "svn:eol-style" "native" properties to all 3 files.

* subversion/include/svn_dirent_uri.h

(svn_dirent_join, svn_dirent_join_many, svn_dirent_basename,

svn_dirent_dirname, svn_dirent_split, svn_dirent_is_absolute,

svn_dirent_canonicalize, svn_dirent_is_canonical):

New function declarations.

* subversion/libsvn_subr/dirent_uri.c

(global): New definitions to support the internal functions.

(dirent_previous_segment, canonicalize): New internal functions.

(svn_dirent_join, svn_dirent_join_many, svn_dirent_basename,

svn_dirent_dirname, svn_dirent_split, svn_dirent_is_absolute,

svn_dirent_canonicalize, svn_dirent_is_canonical):

New function definitions.

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

(test_dirent_is_root, test_dirent_is_absolute, test_dirent_join,

test_dirent_basename, test_dirent_dirname,

test_dirent_canonicalize, test_dirent_is_canonical,

test_dirent_split): New tests.

(test_funcs): Run the new tests, all pass.

Remove the use of a deprecated API.

* subversion/libsvn_wc/revision_status.c

(analyze_status): Implement svn_wc_status_func3_t.

(svn_wc_revision_status): Use svn_wc_get_status_editor4() in place of

svn_wc_get_status_editor3().

Use svn_handle_warning2() instead of deprecated svn_handle_warning().

* subversion/svn/main.c:

* subversion/svn/notify.c:

* subversion/svn/props.c:

* subversion/svn/resolve-cmd.c:

* subversion/svn/resolved-cmd.c:

* subversion/svn/util.c: Use svn_handle_warning2() instead of deprecated

svn_handle_warning().

* subversion/include/svn_error.h

(svn_handle_warning): Deprecate.

Deprecate svn_md5_*() and svn_sha1_*().

* subversion/include/svn_md5.h

(svn_md5_empty_string_digest,

svn_md5_digest_to_cstring_display,

svn_md5_digest_to_cstring,

svn_md5_digests_match): Deprecate.

* subversion/include/svn_sha1.h

(svn_sha1_empty_string_digest,

svn_sha1_digest_to_cstring_display,

svn_sha1_digest_to_cstring,

svn_sha1_digests_match): Deprecate.

Follow-up to r33319:

* subversion/libsvn_client/delete.c

(find_undeletables): Delete 'sb' pointer.

Fix code formatting in some headers.

* subversion/include/svn_cmdline.h:

* subversion/include/svn_compat.h:

* subversion/include/svn_ctype.h:

* subversion/include/svn_diff.h:

* subversion/include/svn_md5.h:

* subversion/include/svn_nls.h:

* subversion/include/svn_pools.h:

* subversion/include/svn_props.h:

* subversion/include/svn_quoprint.h:

* subversion/include/svn_sorts.h:

* subversion/include/svn_time.h:

* subversion/include/svn_types.h:

* subversion/include/svn_version.h:

* subversion/include/svn_xml.h: Place function types on separate lines.

Remove the use of a deprecated API (and cleanup some code as a consequence).

* subversion/libsvn_client/delete.c

(status_baton): Remove.

(find_undeletables): Implement svn_wc_status_func3_t, which allows us to

directly return an error, instead of stashing it in a baton.

(svn_client__can_delete): Call svn_client_status4 in place of

svn_client_status3().

Followup to r33314: Fix svn:ignore property.

* subversion/tests/libsvn_subr:

Include dirent_uri-test in svn:ignore.

Create svn_opt__args_to_target_array() and use it instead of deprecated

svn_opt_args_to_target_array*().

svn_opt_args_to_target_array3()'s doc string recommends to use

svn_client_args_to_target_array(). svn_opt_args_to_target_array*() are

defined in libsvn_subr, while svn_client_args_to_target_array() is defined in

libsvn_client. svn_client_args_to_target_array() cannot be used in svnadmin

and svnsync because they aren't linked against libsvn_client.

* subversion/include/private/svn_opt_private.h

(svn_opt__args_to_target_array): New function.

* subversion/libsvn_subr/opt.c

(svn_opt__args_to_target_array): Renamed from

svn_opt_args_to_target_array3().

(svn_opt_args_to_target_array3): Wrap svn_opt__args_to_target_array().

* subversion/svnadmin/main.c

(): Include "private/svn_opt_private.h".

(subcommand_lslocks): Use svn_opt__args_to_target_array() instead of

svn_opt_args_to_target_array2().

* subversion/svnsync/main.c

(): Include "private/svn_opt_private.h".

(initialize_cmd, synchronize_cmd, copy_revprops_cmd): Use

svn_opt__args_to_target_array() instead of svn_opt_args_to_target_array2().

(copy_revprops_cmd): Update comment.

* subversion/libsvn_client/cmdline.c

(svn_client_args_to_target_array): Update doc string.

* subversion/libsvn_wc/adm_files.c

(svn_wc_set_adm_dir): Update comment.

On the 'svnpatch-diff' branch:

svn_wc.h / libsvn_wc:

Fix backward compatibility with Subversion 1.5.

* subversion/include/svn_wc.h

(svn_wc_diff4): Delete 'svnpatch_file' argument.

(svn_wc_diff3): Update doc string.

* subversion/libsvn_wc/diff.c

(close_directory): Update comment.

(svn_wc_diff4): Update call to svn_wc_diff5().

(svn_wc_diff3): Update call to svn_wc_diff4().

Remove use of a deprecated API.

* subversion/mod_dav_svn/liveprops.c

(insert_prop): Use svn_fs_file_checksum() instead of

svn_fs_file_md5_checksum().

Issue #2028: Separate directory entry & URI manipulation function from the

to-be deprecated svn_path functions. Start with svn_dirent_is_root.

* subversion/include/svn_path.h

(svn_dirent_is_root): Remove this declaration here, keep it #ifndef-ed for now

for compatibility reasons.

* subversion/libsvn_subr/path.c

(global): Include "svn_dirent_uri.h"

(svn_dirent_is_root): Remove this function here.

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

(test_dirent_is_root): Remove here.

(test_funcs): Remove test_dirent_is_root here.

* subversion/include/svn_dirent_uri.h

* subversion/libsvn_subr/dirent_uri.c

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

New files, contain declaration, definition & test for svn_dirent_is_root.

* build.conf

(dirent_uri-test): New target.

(__ALL_TESTS__): Add dirent_uri-test.

* subversion/libsvn_subr/target.c

* subversion/libsvn_wc/util.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/lock.c

* subversion/libsvn_client/mergeinfo.c

* subversion/libsvn_client/add.c

* subversion/libsvn_client/commit.c

* subversion/libsvn_repos/repos.c

(global): Include "svn_dirent_uri.h".

    • ?
    /trunk/subversion/include/svn_dirent_uri.h
    • ?
    /trunk/subversion/libsvn_subr/dirent_uri.c
Issue #2028: Prepare for move from svn_path* to svn_dirent* and svn_uri* API.

Document current (buggy) behavior of the svn_path* functions in terms of more

testcases.

Most of this testcases are ressurected from r23906.

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

(test_is_url, test_is_uri_safe, test_join, test_basename, test_dirname,

test_decompose, test_canonicalize, test_remove_component,

test_get_longest_ancestor, test_splitext,

test_compose): Rename to test_path_*.

(test_is_root): Rename to test_dirent_is_root.

(test_path_is_url, test_path_join, test_path_basename,

test_path_dirname, test_path_canonicalize,

test_path_remove_component, test_path_get_longest_ancestor): Add new testcases

for Windows dirents and UNC paths.

(test_funcs): Update to renamed test functions.

Follow up r33254 with some tests.

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

(test_canonicalize,

test_is_canonical): Add testcases.

ra_serf: Fix pool issue that became visible after introducing the snapshot

feature.

* subversion/libsvn_ra_serf/update.c

(fetch_file): For the GET request, create the xml handler from the item's

parent pool so that cleanup can be correctly done after the response is

handled.

Change the 'svn status' letter for tree conflicts from 'T' to 'C', following

discussion on the mailing list. A follow-up to r33288 which introduced it.

* subversion/svn/status.c

(print_status): Print 'C' in the tree status column, not 'T'.

* subversion/tests/cmdline/stat_tests.py

(status_with_tree_conflicts): Expect tree-conflict status 'C', not 'T'.

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

(build_tree_from_status): Expect tree-conflict status 'C', not 'T'.

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

(StateItem): Adjust the 'treeconflict' attribute doc-string accordingly.

On the 1.5.x-issue2489 branch:

* README.branch

(Revisions included): Record r33308.

On the 1.5.x-issue2489 branch:

Backport r33304:33307 from trunk to 1.5.x-issue2489 branch which checks

version of libsvn_auth_(gnome_keyring|kwallet) before loading provider

function symbols.

* build/generator/extractor.py

(_filter_names): Following up to r33305 added

svn_auth_gnome_keyring_version and svn_auth_kwallet_version

to the list of functions not available on Windows.