subversion

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

Changeset 873331 is being indexed.

In the ctypes-python-bindings branch: Make sure that platform-specific functions

are available, even if we run ctypesgen on older versions of Subversion, which

don't know about ctypesgen. This is only necessary for compatibility with

Subversion 1.5 and earlier.

* csvn/core/__init__.py: Update as described above.

Let ctypesgen see all function definitions on all platforms, so that the

generated wrappers in the ctypes-python-bindings will be platform-independent.

* subversion/include/svn_client.h,

subversion/include/svn_auth.h

(svn_client_get_windows_simple_provider,

svn_auth_get_windows_simple_provider,

svn_auth_get_keychain_simple_provider,

svn_auth_get_keychain_ssl_client_cert_pw_provider):

Let ctypesgen see these functions on all platforms.

Merge r32900, r32911, r32912 from trunk:

* r32900, r32911, r32912

Update tools/client-side/bash_completion to support v1.5 features.

r32900 and r32911 add completion for the arguments of the --show-revs

and --set-depth options, respectively.

r32912 adds heuristic completion help for merging.

Justification:

Useful updates. Little harm if anything is wrong with it.

Notes:

Requires only one +1 and one +0.

Votes:

+0: fabien (by email <http://svn.haxx.se/dev/archive-2008-09/0151.shtml>)

+1: julianfoad

Prevent segfault when Windows paths with forward slashes are passed.

* subversion/libsvn_subr/path.c

(svn_path_canonicalize): only treat the path as an URI if the hostname is

valid.

* www/svn_1.6_releasenotes.html

(file-externals):

Update for this feature.

On the 1.5.x-issue2489 branch:

* README.branch

(Revisions included): Record r33251.

On the 1.5.x-issue2489 branch:

Backport r32874 from trunk to 1.5.x-issue2489 branch which fixes

unnecessary plaintext password saving prompt when the username

is supplied on the command line and the password is already cached.

* STATUS: Nominate and approve some bash_completion updates.
* subversion/libsvn_ra_serf/README: Update ra_serf status.
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.

Add a blank column to the "svn status" output after the first six columns,

to make way for a tree-conflict status indication.

* subversion/svn/status.c

(print_status): Print an extra blank.

* subversion/tests/cmdline/depth_tests.py,

subversion/tests/cmdline/revert_tests.py,

subversion/tests/cmdline/special_tests.py,

subversion/tests/cmdline/stat_tests.py,

subversion/tests/cmdline/svnadmin_tests.py

Wherever a particular status output is expected: Expect an extra blank.

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

(build_tree_from_status): Expect an extra blank.

* subversion/libsvn_subr/path.c

(svn_path_canonicalize):

Follow up to r33245; spelling fix and wrap lines at 80 characters.

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.

Fix issue #3219: add a line in the help text of 'svnsync init' explaining the

new (since 1.5) possibility to sync only a part of a source repository.

* subversion/svnsync/main.c

(svnsync_cmd_table): Add line about the source URL in 'initialize' section.

On the 'svnpatch-diff' branch:

* subversion/include/svn_client.h

(svn_client_diff4, svn_client_diff_peg4): Mark with SVN_DEPRECATED.

* subversion/libsvn_subr/path.c: Fix typo in comment.
Allow to store/restore the current user marks

* trunk/contrib/client-side/emacs/psvn.el:

(svn-status-store-usermarks): New function bound to * s:

store the current set of user marks

(svn-status-load-usermarks): New function bound to * l:

load previously stored user marks

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.

On the 1.5.x-issue2489 branch:

* README.branch

(Revisions included): Record r33119 was reverted in r33233.

On issue-2897-take2 branch:

Merge r32478 through r33234 from trunk.

    • ?
    /branches/issue-2897-take2/subversion/libsvn_wc/entries.h
    • ?
    /branches/issue-2897-take2/subversion/libsvn_repos/log.c
    • ?
    /branches/issue-2897-take2/build/win32/make_dist.py
    • ?
    /branches/issue-2897-take2/subversion/libsvn_wc/status.c
    • ?
    /branches/issue-2897-take2/subversion/libsvn_fs_fs/lock.c
    • ?
    /branches/issue-2897-take2/subversion/include/svn_diff.h
  1. … 410 more files in changeset.
On the 1.5.x-issue2489 branch:

* README.branch

(Revisions included): Record r33233, r33234.

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.

Follow-up to r33229: Fix compilation on Windows.

* subversion/libsvn_client/externals.c

(handle_external_item_change): Move variable declaration to top of

function.

On the 1.5.x-issue2489 branch:

Backport r33214 from trunk to 1.5.x-issue2489 branch which allows

to compile against D-Bus 0.*.

On the 1.5.x-issue2489 branch:

Backport r33182 from trunk to 1.5.x-issue2489 branch which reverts

r33118.

On the explore-wc branch:

Further updates to a new revision_status() implementation based on the new

wc_db storage API.

* subversion/libsvn_wc/revision_status.c:

(struct status_baton): include the db handle

(analyze_status): only update the output revisions if we *have* a

revision number for the node. add code to set the sparse_checkout and

switched flags in the output structure (based on new APIs in wc_db.h)

(svn_wc_revision_status): initialize the "db" field in the baton

* subversion/include/private/svn_wc_private.h,

* subversion/libsvn_client/switch.c,

* subversion/libsvn_wc/adm_ops.c,

* subversion/svn/status.c,

* subversion/tests/cmdline/externals_tests.py:

Follow up to r33229; bump the copyright years.

* branches/file-externals:

Remove this branch, it was merged to the trunk in r33229.

Merge the file-externals branch back to trunk. This allows an

svn:externals to add a file into the working copy. It is implemented

as an 'touch foo; svn add foo; svn switch URL foo'.

  1. … 18 more files in changeset.

On the file externals branch.

* branches/file-externals:

Merge r33206 through r33227 from trunk.

  1. … 7 more files in changeset.