subversion

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

Changeset 873660 is being indexed.

* COMMITTERS: Add jwhitlock as a full committer.

Document the SQLite dependency in the INSTALL file.

* INSTALL

(I.C.13 SQLite): New dependency.

(I.D. Documentation): Section renumbered; was numbered I.C.13.

On the issue-3067-deleted-subtrees branch: Merge r33524-33582 from trunk.
  1. … 55 more files in changeset.
Make tree conflict detection notice modifications deep inside a tree that

"update" is about to delete.

* subversion/libsvn_wc/update_editor.c

(modcheck_baton_t): New data type.

(modcheck_found_entry, modcheck_handle_error, tree_has_local_mods): New

functions.

(check_tree_conflict): Use tree_has_local_mods() to detect deep mods.

* subversion/tests/cmdline/update_tests.py

(update_delete_modified_files): Expect another conflict.

Documentation updates, no functional changes.

* subversion/include/svn_path.h

(svn_path_is_canonical): Update documentation.

Documentation updates, no functional changes.

* subversion/include/svn_dirent_uri.h

(svn_uri_is_canonical): Update documentation.

Reimplement svn_uri_is_canonical without using the slow svn_uri_canonicalize

function. This makes this function much faster, but also doesn't require a pool

anymore so we can use it in situations where a pool is not available.

* subversion/libsvn_subr/dirent_uri.c

(svn_uri_is_canonical): New implementation.

* subversion/libsvn_subr/path.c

(svn_path_is_canonical): Drop pool from call to svn_uri_is_canonical.

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

(test_uri_is_canonical): Ditto.

* subversion/include/svn_dirent_uri.h

(svn_uri_is_canonical): Drop pool from declaration.

Fix Doxygen formatting.

* subversion/include/svn_dirent_uri.h

(svn_dirent_join): Use "@a ARG" instead of "@ARG".

* subversion/include/svn_wc.h

(svn_wc_add_repos_file3): Use "@a ARG" instead of "@ARG".

Follow-up r33576: Simple optimization.

Suggested by: gstein

* subversion/libsvn_ra_serf/xml.c

(svn_ra_serf__add_open_tag_buckets): Use SERF_BUCKET_SIMPLE_STRING_LEN

macro for fixed length strings.

Fix a tree conflict function that was working more by accident than design.

* subversion/libsvn_wc/update_editor.c

(entry_has_local_mods): Take an 'adm_access' parameter instead of

'parent_adm_access', and a 'kind' parameter instead of 'entry', to

simplify the interface and to fix the use of an uninitialized 'adm_access'

variable. Remove all mention of checking subdirectories, as it does not

do this.

(check_tree_conflict): Provide the new parameters to entry_has_local_mods().

Tweak comments.

ra_serf: Introduce internal functions for creating XML serf buckets.

* subversion/libsvn_ra_serf/xml.c:

* subversion/libsvn_ra_serf/ra_serf.h:

(svn_ra_serf__add_xml_header_buckets, svn_ra_serf__add_open_tag_buckets,

svn_ra_serf__add_close_tag_buckets, svn_ra_serf__add_cdata_len_buckets):

New functions for creating XML serf buckets.

(svn_ra_serf__add_tag_buckets): Use new functions to generate XML.

* subversion/libsvn_ra_serf/blame.c

(svn_ra_serf__get_file_revs),

* subversion/libsvn_ra_serf/commit.c

(create_checkout_body, proppatch_walker, create_proppatch_body,

create_delete_body),

* subversion/libsvn_ra_serf/getdate.c

(create_getdate_body),

* subversion/libsvn_ra_serf/getlocations.c

(svn_ra_serf__get_locations),

* subversion/libsvn_ra_serf/getlocationsegments.c

(svn_ra_serf__get_location_segments)

* subversion/libsvn_ra_serf/getlocks.c

(create_getlocks_body),

* subversion/libsvn_ra_serf/locks.c

(create_getlock_body, create_lock_body),

* subversion/libsvn_ra_serf/log.c

(svn_ra_serf__get_log)

* subversion/libsvn_ra_serf/merge.c

(svn_ra_serf__merge_lock_token_list, create_merge_body),

* subversion/libsvn_ra_serf/mergeinfo.c

(create_mergeinfo_body),

* subversion/libsvn_ra_serf/options.c

(create_options_body),

* subversion/libsvn_ra_serf/replay.c

(create_replay_body),

* subversion/libsvn_ra_serf/update.c

(set_path, delete_path, link_path, finish_report, make_update_reporter): Use

svn_ra_serf__add_* to generate XML buckets. Don't xml-escape parameters

since svn_ra_serf__add_* will care about xml-escaping.

Further discussion on IRC... we record the size of the WORKING file. The

ACTUAL file might be changed, and its size is found via an apr_stat() on

the file in the filesystem. NODE.working_size is what we expect the size

to be given the PRISTINE file plus the relevant translations.

* subversion/libsvn_wc/wc-metatdata.sql3:

(NODE, NODE_CHANGES): rename actual_size to working_size

Small naming tweaks.

* subversion/libsvn_wc/wc-metadata.sql3:

(TEXT_BASE): renamed to ...

(PRISTINE): ... this. The name PRISTINE is a bit better recognized by

the masses, so going with that.

(PRISTINE.size): renamed from actual_size. no need for a prefix on this.

Improve comments.

* subversion/libsvn_wc/update_editor.c

(check_tree_conflict): Improve comments.

Various post-release housekeeping items.

* subversion/include/svn_version.h

(SVN_VER_PATCH): Bump version number.

* STATUS:

1.5.3 -> 1.5.4

Tagging 1.5.3 with svn_version.h matching tarball.
    • ?
    /tags/1.5.3/subversion/include/svn_version.h
* CHANGES:

Bring 1.5.3 section up-to-date with trunk.

* CHANGES

(1.5.3): Datestamp with likely release date.

* contrib/hook-scripts/enforcer/enforcer: Adjust for the r27808

svnlook output changes.

Patch by: wsanchez

Found by: Panu Outinen <panu@vertex.fi>

Adding tests for issues #3295 and #1675.

* subversion/tests/cmdline/diff_tests.py

(make_file_edit_del_add): New helper function.

(diff_url_against_local_mods): New test for issue #3295.

(diff_preexisting_rev_against_local_add): New test for issue #1675.

(test_list): Add above tests as XFail.

Note from the future: diff_preexisting_rev_against_local_add is not really

testing issue #1675, see

http://subversion.tigris.org/issues/show_bug.cgi?id=1675#desc7

Fix Windows build break.

* subversion/libsvn_wc/adm_ops.c:

(svn_wc_queue_committed2): add function skeleton, to be filled in soon.

Don't use neon to create the pristine repository when running ra_serf tests.

Thanks to hwright for identifying the problem.

* subversion/cmdline/svntest/main.py

(run_tests): Create the config dir before setting up the pristine repos.

* STATUS: Vote on the r32968 group.
* subversion/libsvn_client/merge.c

(merge_props_changed): Following up on r32975, update indentation of

apr_hash_set call to show it is not inside the if.

On the issue-3067-deleted-subtrees branch: Implement ra-serf version of the

get-deleted-rev RA API.

Several merge tests fail intermittently with this change with the error

svn: Error running context: An established connection was aborted by the

software in your host machine. Can't put my finger on what is wrong just

yet...

* subversion/libsvn_ra_serf/get_deleted_rev.c

Include svn_ra.h, svn_xml.h, svn_path.h, and svn_private_config.h.

(drev_state_e): New enum.

(drev_info_t, drev_context_t): New structs.

(push_state, start_getdrev, end_getdrev, cdata_getdrev,

create_getdrev_body): New functions.

(GETDREV_HEADER, GETDREV_FOOTER): New #defines.

(svn_ra_serf__get_deleted_rev): Implement previously empty function.

On the issue-2843-dev branch:

* subversion/libsvn_wc/update_editor.c

(do_entry_deletion): Resolve conflict of r33560.

* subversion/libsvn_wc/README: Same.

On the issue-2843-dev branch: bring almost-up-to-date with trunk.

I ran:

svn merge https://svn.collab.net/repos/svn/trunk@r33535

This was when latest trunk was actually r33554. But due to r33536,

attempts to merge the very latest trunk would end early with this

error:

subversion/libsvn_ra_neon/util.c:545: (apr_err=160013)

svn: '/repos/svn/!svn/bc/33554/branches/issue-2843-dev/tools/\

buildbot/slaves/win32-xp-VS2005' path not found

subversion/libsvn_ra_neon/util.c:1243: (apr_err=175002)

svn: Error reading spooled REPORT request response

So I'm working around it by taking this one step at a time. The first

step is this merge, which brings us up to r33535. I've also left two

files conflicted, so that the conflict resolution can be a separate

commit immediately following this one. They are:

subversion/libsvn_wc/update_editor.c

subversion/libsvn_wc/README

(The README resolution is trivial, and the update_editor.c resolution

probably so, but I want it to be a separate commit just in case.)

    • ?
    /branches/issue-2843-dev/subversion/svn/tree-conflicts.c
    • ?
    /branches/issue-2843-dev/subversion/libsvn_fs_base/err.c
    • ?
    /branches/issue-2843-dev/subversion/mod_dav_svn/version.c
  1. … 518 more files in changeset.
Following up to r33335, replace 'print()' with 'print("")' to

remove '()' output in gen-make.py --help. Also exit with error 1 on

invalid argument.

* gen-make.py

(_usage_exit): Make sure the printed tuple always contains a string

and exit with error 1 instead of 0.

Following up to r33553, use the new enum values within the #if defined(WIN32)

blocks. This should fix the Windows builds.

* subversion/libsvn_subr/dirent_uri.c

(canonicalize, get_longest_ancestor_length,

is_child, is_ancestor): Check for type_dirent instead of not uri for the

Windows specific cases.

Honor svn-status-default-diff-arguments in svn-status-diff-show-changeset

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

(svn-status-diff-show-changeset): Honor svn-status-default-diff-arguments

Now every invoked diff operation from psvn uses

svn-status-default-diff-arguments