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

Changeset 1424780 is being indexed.

Merge the in-repo-authz branch back to trunk.

See http://svn.haxx.se/dev/archive-2012-12/0397.shtml

  1. … 23 more files in changeset.
* subversion/tests/libsvn_subr/path-test.c

(test_path_splitext): Removed unused result member of tests struct.

Combine two unit test files, one of which only had one test in it.

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

(condense_targets_func_t, condense_targets_tests_helper,

test_path_condense_targets): Move these here from target-test.c.

(test_funcs): Add 'test_path_condense_targets'.

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

Delete this file.

* build.conf

(target-test): Remove this section.

(__ALL__): Remove 'target-test'.

  1. … 2 more files in changeset.
Reintegrate integrate-string-improvements branch into /trunk.
  1. … 83 more files in changeset.
Following up on r1090699, try to fix the non-Windows path tests.

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

(test_dirent_local_style): Remove uncanonical paths from tests.

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

(test_path_local_style): Remove uncanonical paths from tests.

  1. … 1 more file in changeset.
Make the conversion functions from internal path style to local style assume

that their input is canonical. But just to be safe don't make the dirent

variant fail on non canonical paths.

These functions are used in too many error messages to make them take the

penalty of full canonicalization on all their input. (My profiler says that

just this canonicalize in the to local style function takes over 0.5% of

my checkout time, while it is never needed.)

* subversion/include/svn_dirent_uri.h

(header): Remove *_local_style from the list of functions that allows non

canonical paths.

* subversion/libsvn_subr/dirent_uri.c

(SVN_USE_DOS_PATHS): Update comment.

(local_style): Remove expensive canonicalization.

(svn_relpath_local_style): Add maintainer mode only path style verification,

like we do in other path functions.

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

(SVN_USE_DOS_PATHS): Update comment.

(test_dirent_local_style): Add two testcases.

(test_relpath_local_style): Remove now invalid case.

(test_dirent_internal_style): Add new case.

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

(SVN_USE_DOS_PATHS): Define macro and update all users.

(test_path_canonicalize): Enable testvalue that was disabled.

(test_path_local_style): Update expected result.

  1. … 3 more files in changeset.
Reintegrate the 'uris-as-urls' branch into trunk.

(Merged /subversion/branches/uris-as-urls:r1060426-1064427.)

This should wrap up issue #2028.

  1. … 73 more files in changeset.
Update every occurence of the Subversion repository URL to apache.org,

except in CHANGES (for sentimental reasons, I guess).

* contrib/cgi/mirror_dir_through_svn.README,

* contrib/client-side/emacs/psvn.el,

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

* contrib/hook-scripts/commit-email.pl.in,

* contrib/server-side/svn-fast-backup,

* contrib/server-side/svnmirror.sh,

* contrib/server-side/svnmirror-test.sh,

* doc/user/cvs-crossover-guide.html,

* notes/fs_dumprestore.txt,

* notes/http-and-webdav/webdav-usage.html,

* notes/interactive-conflict-resolution.txt,

* notes/merge-tracking/func-spec.html,

* notes/merge-tracking/requirements.html,

* notes/merge-tracking/summit.html,

* notes/object-model.txt,

* notes/obliterate/hooks/post-obliterate.tmpl,

* notes/obliterate/hooks/pre-obliterate.tmpl,

* notes/obliterate/plan-milestones.html,

* notes/subversion-design.html,

* notes/variance-adjusted-patching.html,

* packages/windows-innosetup/Pre.rtf,

* packages/windows-WiX/BuildSubversion/WixDialog/loc/en-us/Pre.rtf,

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

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/Version.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java,

* subversion/bindings/swig/perl/native/Client.pm,

* subversion/libsvn_repos/repos.c,

* subversion/libsvn_wc/wc_db.h,

* subversion/tests/cmdline/merge_tests.py,

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

* tools/buildbot/slaves/README,

* tools/client-side/change-svn-wc-format.py,

* tools/client-side/svn-graph.pl,

* tools/client-side/svn-viewspec.py,

* tools/dev/contribulyze.py,

* tools/dev/po-merge.py,

* tools/dev/svn-merge-revs.py,

* tools/dist/gen_nightly_ann.py: Update Subversion repository URL to apache.

  1. … 40 more files in changeset.
Test out my new and fancy ASF commit priviledges by changing the copyright

wording in our license headers to reflect ownership by the ASF.

* NOTICE:

Change terminology to ASF, and update a link.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the ASF, and update the project website.

* everywhere:

Change license text to reflect ASF ownership.

  1. … 891 more files in changeset.
Following up on r39958, move 2 deprecated path functions to deprecated.c and

update test results for a small change in results on Windows.

The change in result on Windows allows old code using svn_path_canonicalize()/

svn_path_internal_style() to produce canonical dirents after the drive letter

casing restrictions were updated.

* subversion/libsvn_subr/deprecated.c

(svn_path_canonicalize): New function; wrapper around uri/dirent support.

(svn_path_is_canonical): New function wrapper around uri/dirent support.

* subversion/libsvn_subr/path.c

(svn_path_internal_style,

svn_path_local_style): Remove functions. These functions were

added to deprecated.c in r39958.

(svn_path_canonicalize,

svn_path_is_canonical): Remove functions.

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

(test_path_local_style,

test_path_internal_style): Expect upper case driveletters on Windows.

  1. … 2 more files in changeset.
Relicense Subversion under the Apache License, Version 2.0.

* NOTICE: New.

* LICENSE: New.

* COPYING,

subversion/LICENSE: Remove.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the SVN Corp, and that it contains contributions from

many people, as referenced in NOTICE.

* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:

Relicense the SVN parts under Apache 2.0.

* everywhere:

Change copyright notices in file headers to reflect the Apache 2.0 license.

  1. … 882 more files in changeset.
Replace deprecated test func macros in the C tests. This eliminates the need

to do the following dance in every test function:

*msg = "foo";

if (msg_only)

return SVN_NO_ERROR;

This does not remove the deprecated symbols from svn_test.h; I plan to do it

in a follow up commit.

[ in subversion/tests ]

* libsvn_client/client-test.c,

libsvn_delta/random-test.c,

libsvn_delta/range-index-test.h,

libsvn_delta/window-test.c,

libsvn_diff/diff-diff3-test.c,

libsvn_diff/parse-diff-test.c,

libsvn_fs/fs-test.c,

libsvn_fs/locks-test.c,

libsvn_fs_base/changes-test.c,

libsvn_fs_base/fs-base-test.c,

libsvn_fs_base/key-test.c,

libsvn_fs_base/strings-reps-test.c,

libsvn_fs_fs/fs-pack-test.c,

libsvn_ra_local/ra-local-test.c,

libsvn_repos/repos-test.c,

libsvn_subr/auth-test.c,

libsvn_subr/cache-test.c,

libsvn_subr/checksum-test.c,

libsvn_subr/compat-test.c,

libsvn_subr/config-test.c,

libsvn_subr/dirent_uri-test.c,

libsvn_subr/error-test.c,

libsvn_subr/hashdump-test.c,

libsvn_subr/mergeinfo-test.c,

libsvn_subr/opt-test.c,

libsvn_subr/path-test.c,

libsvn_subr/revision-test.c,

libsvn_subr/skel-test.c,

libsvn_subr/stream-test.c,

libsvn_subr/string-test.c,

libsvn_subr/target-test.c,

libsvn_subr/time-test.c,

libsvn_subr/translate-test.c,

libsvn_subr/utf-test.c,

libsvn_wc/tree-conflict-data-test.c:

Do the above described transformation.

  1. … 34 more files in changeset.
Fix a typo in comment.

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

(): s/funtions/functions/

In path-test, undef SVN_DEPRECATED so that we don't get deprecation

warnings. Add a couple missing commas to the test arrays.

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

(): ensure SVN_DEPRECATED is empty before including svn_path.h

(test_path_local_style): add a missing comma in the tests[] def.

(test_path_internal_style): add a missing comma in the tests[] def.

Fix svn_path_local_style() and svn_path_internal_style() behavior on

UNC paths.

* subversion/libsvn_subr/path.c

(svn_path_local_style, svn_path_internal_style):

Call svn_dirent_*() instead of svn_uri_*() on UNC paths.

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

(test_path_local_style, test_path_internal_style): New function.

(test_funcs): Add new tests.

  1. … 1 more file in changeset.
Revert path-test changed of r33424 to show that UNC path support

in the svn_path_*() functions is currently broken.

r33424 removed UNC path support from svn_uri_*() functions and

shouldn't have disabled it for svn_path_*().

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

(test_path_dirname, test_path_canonicalize, test_path_is_ancestor,

test_path_is_canonical): Re-enable old test values.

Follow-up to r35614:

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

(test_path_join): Simplify code.

Suggested by: gstein

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

(test_path_join): Fix compiler warning.

Delete trailing whitespace.

Follow-up to r26317 and r27598.

* build/generator/extractor.py:

* build/generator/gen_vcnet_vcproj.py:

* build/generator/gen_win.py:

* contrib/client-side/svnmerge/svnmerge-migrate-history-remotely.py:

* subversion/bindings/ctypes-python/csvn/repos.py:

* subversion/bindings/ctypes-python/csvn/wc.py:

* subversion/bindings/ctypes-python/examples/mucc.py:

* subversion/bindings/ctypes-python/setup.py:

* subversion/bindings/ctypes-python/test/localrepos.py:

* subversion/bindings/ctypes-python/test/remoterepos.py:

* subversion/bindings/ctypes-python/test/run_all.py:

* subversion/bindings/ctypes-python/test/svntypes.py:

* subversion/bindings/ctypes-python/test/wc.py:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Operation.java:

* subversion/include/private/svn_auth_private.h:

* subversion/include/private/svn_sqlite.h:

* subversion/include/private/svn_wc_private.h:

* subversion/include/svn_auth.h:

* subversion/include/svn_checksum.h:

* subversion/include/svn_client.h:

* subversion/include/svn_cmdline.h:

* subversion/include/svn_dirent_uri.h:

* subversion/include/svn_path.h:

* subversion/include/svn_props.h:

* subversion/libsvn_client/commit_util.c:

* subversion/libsvn_client/copy.c:

* subversion/libsvn_client/deprecated.c:

* subversion/libsvn_client/export.c:

* subversion/libsvn_client/externals.c:

* subversion/libsvn_client/info.c:

* subversion/libsvn_client/merge.c:

* subversion/libsvn_client/mergeinfo.h:

* subversion/libsvn_client/ra.c:

* subversion/libsvn_client/repos_diff.c:

* subversion/libsvn_fs_base/bdb/checksum-reps-table.c:

* subversion/libsvn_fs_base/bdb/checksum-reps-table.h:

* subversion/libsvn_fs_base/bdb/miscellaneous-table.c:

* subversion/libsvn_fs_base/bdb/reps-table.c:

* subversion/libsvn_fs_base/dag.c:

* subversion/libsvn_fs_base/dag.h:

* subversion/libsvn_fs_base/err.h:

* subversion/libsvn_fs_base/fs.c:

* subversion/libsvn_fs_base/reps-strings.c:

* subversion/libsvn_fs_base/tree.c:

* subversion/libsvn_fs_base/tree.h:

* subversion/libsvn_fs_base/util/fs_skels.c:

* subversion/libsvn_fs_fs/dag.h:

* subversion/libsvn_fs_fs/fs_fs.h:

* subversion/libsvn_fs/fs-loader.c:

* subversion/libsvn_fs/fs-loader.h:

* subversion/libsvn_fs_fs/rep-cache.c:

* subversion/libsvn_fs_fs/rep-cache.h:

* subversion/libsvn_fs_fs/tree.c:

* subversion/libsvn_ra/compat.c:

* subversion/libsvn_ra_neon/log.c:

* subversion/libsvn_ra_neon/session.c:

* subversion/libsvn_ra_serf/log.c:

* subversion/libsvn_ra_serf/update.c:

* subversion/libsvn_ra_serf/util.c:

* subversion/libsvn_ra_serf/win32_auth_sspi.c:

* subversion/libsvn_repos/hooks.c:

* subversion/libsvn_repos/log.c:

* subversion/libsvn_repos/repos.h:

* subversion/libsvn_subr/checksum.c:

* subversion/libsvn_subr/cmdline.c:

* subversion/libsvn_subr/config_file.c:

* subversion/libsvn_subr/config_win.c:

* subversion/libsvn_subr/dirent_uri.c:

* subversion/libsvn_subr/dso.c:

* subversion/libsvn_subr/io.c:

* subversion/libsvn_subr/nls.c:

* subversion/libsvn_subr/simple_providers.c:

* subversion/libsvn_subr/sqlite.c:

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c:

* subversion/libsvn_subr/stream.c:

* subversion/libsvn_subr/win32_crypto.c:

* subversion/libsvn_wc/adm_ops.c:

* subversion/libsvn_wc/diff.c:

* subversion/libsvn_wc/props.c:

* subversion/libsvn_wc/status.c:

* subversion/libsvn_wc/tree_conflicts.c:

* subversion/libsvn_wc/tree_conflicts.h:

* subversion/libsvn_wc/update_editor.c:

* subversion/libsvn_wc/wc_db.h:

* subversion/svn/cl.h:

* subversion/svndumpfilter/main.c:

* subversion/svnlook/main.c:

* subversion/svn/propedit-cmd.c:

* subversion/svn/propget-cmd.c:

* subversion/svnserve/main.c:

* subversion/svn/status-cmd.c:

* subversion/svn/tree-conflicts.c:

* subversion/svn/util.c:

* subversion/tests/cmdline/commit_tests.py:

* subversion/tests/cmdline/copy_tests.py:

* subversion/tests/cmdline/info_tests.py:

* subversion/tests/cmdline/log_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/prop_tests.py:

* subversion/tests/cmdline/revert_tests.py:

* subversion/tests/cmdline/stat_tests.py:

* subversion/tests/cmdline/svntest/actions.py:

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

* subversion/tests/cmdline/switch_tests.py:

* subversion/tests/cmdline/tree_conflict_tests.py:

* subversion/tests/cmdline/update_tests.py:

* subversion/tests/libsvn_repos/repos-test.c:

* subversion/tests/libsvn_subr/checksum-test.c:

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

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

* subversion/tests/libsvn_subr/target-test.c:

* subversion/tests/libsvn_wc/tree-conflict-data-test.c:

* tools/examples/svnlook.py: Delete trailing whitespace.

  1. … 112 more files in changeset.
Fix some the svn_uri_canonicalize and svn_canonicalize_path tests on

Windows. Remove the UNC-path test cases for the svn_path functions, as those

are not canonical uris.

Patch by: rhuijben

me

(Testcases by me.)

* subversion/libsvn_subr/dirent_uri.c

(canonicalize): Only consider '//' as the start of a UNC path when working

with dirents, not uris.

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

(test_path_dirname, test_path_canonicalize,

test_path_is_ancestor, test_path_is_canonical): Comment out UNC-path test

cases. The svn_path functions aren't documented to support UNC paths, and

they don't work for all svn_path functions either.

  1. … 1 more file in changeset.
Add some URL test cases for svn_path_join and document that svn_path_join_many

doesn't support URLs.

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

(test_path_join): Add URL test cases for svn_path_join, make sure they aren't

run for svn_path_join_many.

* subversion/include/svn_path.h

(svn_path_join_many): Add note about URLs not being supported.

  1. … 1 more file in changeset.
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".

  1. … 14 more files in changeset.
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.

Windows standards dictate drive letters are in upper case, so let's

make svn_path_canonicalize do the same. Our test suite expects the same

as it does case sensitive compares on normalized paths.

Suggested by: rhuijben

* subversion/libsvn_subr/path.c

(svn_path_canonicalize): Change drive letter to upper case instead of

lower.

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

(test_canonicalize,

test_is_canonical): Update the 'drive letter' test cases.

  1. … 1 more file in changeset.
Follow up r33240 with a fix for the canonicalization of UNC server names.

This should handle the Windows buildbot test failures.

* subversion/libsvn_subr/path.c

(svn_path_canonicalize): Fix decision on when a path is UNC or not.

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

(test_canonicalize,

test_is_canonical): Add some basic test cases.

  1. … 1 more file in changeset.
On Windows, convert the disc letter of file:// URIs and the server name of

UNC paths to lower case during canonicalization. This is in line with the

approach chosen to fix issue #2475.

* subversion/libsvn_subr/path.c

(svn_path_canonicalize): Convert drive letter if file:// URIs and server

name in UNC paths to lower case. Adds small optimization for checking

empty hostname paths.

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

(test_canonicalize,

test_is_canonical): Add extra test cases for file:// URIs and UNC paths.

  1. … 1 more file in changeset.
Fix issue #2475: scheme and domain name in urls should be handled case

insensitive.

During canonicalization of urls, the scheme and domain name are now converted to

lower case. This is more practical than doing expensive url comparisons where we

use a simple strcmp right now.

As the entries files can now contain non-canonical urls, these will be

canonicalized during wc upgrade.

* subversion/libsvn_subr/path.c

(global): Include apr_uri.h

(svn_path_canonicalize): Convert the scheme and hostname part of a uri to lower

case.

* subversion/include/svn_path.h

(svn_path_canonicalize): Add comment.

* subversion/libsvn_wc/wc.h

(SVN_WC__VERSION): Add comment on changes between wc format 9 and 10.

(SVN_WC__CHANGED_CANONICAL_URLS): Add new tag for wc format 10.

* subversion/libsvn_wc/entries.c

(read_url): New function that reads an url from an entries files and takes into

account the changed canonicalization in wc format 10.

(read_entry): Add argument entries_format for use when reading urls.

(read_entries): Read the format from the entries file.

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

(test_canonicalize,

test_is_canonical): Add some extra testcases for case insensitive scheme and

hostnames.

* subversion/tests/cmdline/copy_tests.py

(change_case_of_hostname): Utility function, changes case of hostname

of an uri.

(path_move_and_copy_between_wcs_2475,

path_copy_in_repo_2475): New tests.

(test_list): Run the new tests, both pass.

  1. … 5 more files in changeset.
Canonicalise URIs which have an empty hostname part correctly.

This fixes the crash described in #2116 ('svn log file:///'

results in a failed assertion).

* subversion/libsvn_subr/path.c

(svn_path_canonicalize): We used to strip the trailing slash

of URIs with no hostname, e.g. http:// got canonicalised to http:/

Don't do that!

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

(test_canonicalize): Add some test cases for the above.

* subversion/libsvn_ra_local/split_url.c

(svn_ra_local__split_URL): Treat file:// equivalent to file:///.

This function used to complain about a missing hostname when

just passed "file://". But "file://" is the canonical version

of "file:///", which is equivalent to "file://localhost/".

skip_uri_scheme() (in subversion/libsvn_subr/path.c) and

therefore svn_path_is_url() have been considering "file://"

a valid URL since r14445.

Review by: danielsh

  1. … 2 more files in changeset.
* subversion/libsvn_subr/path-test.c

(test_canonicalize):

Add two testcases for trailing slashes.