subversion

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

Changeset 869454 is being indexed.

* subversion/libsvn_ra_neon/util.c (generate_error) [SVN_NEON_0_27]:

Include the (descriptive) error message from neon for the NE_AUTH case.

Add support for neon 0.28:

* configure.ac: Add neon 0.28 to list of supported versions.

* build/ac-macros/neon.m4 (SVN_NEON_CONFIG, SVN_LIB_NEON): Define

SVN_NEON_0_28 for neon 0.28; extend supported version lists by one.

* STATUS: Nominate r29377.

Fix notification for merges from pre-1.5 repos using 1.5 client,

cherry-picking multiple changesets.

Before this change, we got the merge notification for only the first

changeset as it appears in the command line, though merge did happen

for all the changesets:

$ svn co http://svn.collab.net/repos/svn/branches/1.5.x svn_1.5.x

$ cd svn_1.5.x

$ svn merge -c29185 -c29186 -c29188 http://svn.collab.net/repos/svn/trunk .

--- Merging r29185 into '.':

path1

path2

...

* subversion/libsvn_client/merge.c

(do_directory_merge): Reset notify_b->cur_ancestor_index to -1,

before each merge drive.

Found by: arfrever

* STATUS: Nominate [r29189, r29228, r29232, r29251] and [r29328].

Prune mergeinfo-api-cleanup branch, merged to trunk in r29374.

Merge the mergeinfo-api-cleanup branch to trunk.

Major changes:

* Add typedefs of svn_mergeinfo_t and svn_mergeinfo_catalog_t for

(apr_hash_t *); use them in many places, and remove redundant

documentation of these types.

* svn_[repos_]fs_get_mergeinfo now return parsed mergeinfo (like

svn_ra_get_mergeinfo).

* A bug where the include_descendants argument to svn_fs_get_mergeinfo

was essentially ignored is fixed.

* The routines to stringify mergeinfo and rangelists now make

svn_string_t, not svn_stringbuf_t.

* The unused API svn_range_compact is removed.

* I left in two TODO(miapi) notes about APIs that I think should be

removed (because they imply that it's ever OK to have unsorted

rangelists).

  1. … 17 more files in changeset.
Merged r29311 through r29372 from trunk to the mergeinfo-api-cleanup branch.

Resolved conflicts in dav_svn__get_mergeinfo_report and the docstring

for svn_ra_get_mergeinfo.

  1. … 18 more files in changeset.
On the mergeinfo-api-cleanup branch:

Don't complain in a TODO(miapi) about svn_mergeinfo_parse taking a

const char * instead of an svn_string_t. It's not worth the effort to

change (and legal values shouldn't contain '\0' anyway).

* subversion/include/svn_mergeinfo.h

(svn_mergeinfo_parse): Remove TODO(miapi) command.

On the mergeinfo-api-cleanup branch:

Remove unused svn_range_compact API. We can always add it back if

it's useful. (Though we should probably call it

svn_merge_range_compact for consistency.)

* subversion/include/svn_mergeinfo.h

* subversion/libsvn_subr/mergeinfo.c

(svn_range_compact): Remove

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

(test_range_compact): Remove.

(test_funcs): Adjust.

On the mergeinfo-api-cleanup branch:

Remove existential questions from two APIs, because hwright says they

might be useful for 'log -g'.

* subversion/include/svn_mergeinfo.h

(svn_rangelist_count_revs, svn_rangelist_to_revs): Remove

TODO(miapi) marker.

* subversion/libsvn_wc/diff.c

(file_diff): Whitespace indent fix.

Bug fix that incidentally allows more fuzzing on directory copy and move

operations at patch-generation time.

* subversion/libsvn_wc/diff.c

(file_diff): Ensure this is the top-most entry to be copied before

marking it as a diffable item.

* STATUS: Nominate r29364, r29360, r29358, r29366 (the issue #3089 changes).

Follow up to r29360 with a more conservative fix:

* subversion/mod_dav_svn/reports/mergeinfo.c

(dav_svn__get_mergeinfo_report): Flush the brigade if there was any

data sent, no matter what the value of derr. This essentially

reverts the code back to the way it was, then adds a conditional

making the flush dependent on whether data was sent.

We may want to consider a similar technique for other parts of mod_dav_svn.

Remove the mergeinfo-capability branch, now that issue #3089 is done.
Fix issue #3089: only claim mergeinfo capability if repos has it too.

This change teaches all three RA layers to correctly divine

server-side mergeinfo support. It is consolidated from various

changes on the mergeinfo-capability branch; see the r29358 log

message for more information.

Do ra_svn:

* subversion/svnserve/serve.c

(serve): Only report mergeinfo capability if repos supports it.

* subversion/libsvn_ra_svn/client.c

(open_session): Expect repos capabilities to arrive separately.

* subversion/include/svn_ra_svn.h

(svn_ra_svn_set_capabilities): Document idempotency, because we

depend on it now.

* subversion/libsvn_ra_svn/protocol: Document how repository

capabilities get sent to the client.

Do ra_dav:

* subversion/libsvn_ra_serf/serf.c

(capability_server_yes): New capability state.

(capabilities_headers_iterator_callback): Set above state for mergeinfo.

(svn_ra_serf__has_capability): Only claim mergeinfo capability if

repository supports it as well as server.

* subversion/libsvn_ra_neon/session.c

(capability_server_yes): New capability state.

(parse_capabilities): Set above state for mergeinfo.

(svn_ra_neon__has_capability): Only't claim mergeinfo capability if

repository supports it as well as server.

Do ra_local:

* subversion/libsvn_ra_local/ra_plugin.c

(svn_ra_local__has_capability): Just ask repository directly if it

has mergeinfo capability.

Update documentation:

* subversion/include/svn_ra.h

(svn_ra_get_mergeinfo): Document error behavior that we depend on,

and correct a comment about mergeinfo support.

Merge r29329 from trunk, which see for details.

* r29329

Fix regression in svnadmin verify in r24559, new in 1.5.x. We can

just roll back 24559 on the 1.5.x branch, but that makes svnadmin

unusable on large repositories. We must do one or the other.

Votes:

+1: epg, cmpilato

Also:

* STATUS

Remove this change from the approved list.

    • ?
    /branches/1.5.x/subversion/libsvn_repos/dump.c
Merge r29313 from trunk, which see for details.

* r29313

This is a follow on to the already approved r29250 "Yet another node-

origins-cache-for-FSFS implementation!" that modifies the Ruby bindings

tests so they pass.

Votes:

+1: joeswatosh, cmpilato

Also:

* STATUS

Remove this change from the approved list.

Merge r29261 from trunk, which see for details.

* r29261

Make the propget API usable in the Ruby bindings.

Votes:

+1: joeswatosh, cmpilato

Also:

* STATUS

Remove this change from the approved list.

For issue #3089: cause mod_dav_svn to report an error more recognizeably.

There is some question as to whether this is the right solution, see:

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=135089

From: Karl Fogel <kfogel@red-bean.com>

To: dev@subversion.tigris.org

Subject: Better error reporting from mod_dav_svn?

Date: Thu, 14 Feb 2008 00:36:40 -0500

Message-Id: <87r6fgumjb.fsf@red-bean.com>

We may stick with this method, or we may switch to some other method

of letting the client detect the "mergeinfo is unimplemented" error.

Either way, it is independent of other changes related to issue #3089,

so I've extracted it from r29314 on the mergeinfo-capability branch.

See the r29358 log message for more about how changes from that branch

are being ported to trunk.

[Note: changed to a more conservative solution for 1.5, see r29366.]

* subversion/mod_dav_svn/reports/mergeinfo.c

(dav_svn__get_mergeinfo_report): Don't flush before returning error,

as flushing might obscure the error due to certain intricacies of

mod_dav's plumbing.

Merge r29230-29231 and r29233 from trunk, which see for details.

* r29230-29231, r29233

Obsessively destroy Neon requests, even in error cases.

Notes:

Either r29230 or r29231 prevents a reproducible segfault.

Votes:

+1: glasser, cmpilato

Also:

* STATUS

Remove this change from the approved list.

For issue #3089: Add an svn_repos_has_capability() interface.

Provenance:

This change was originally in r29314 on the mergeinfo-capability

branch. I'm porting the changes on that branch manually to trunk, in

logical pieces, for better reviewability. Since the port commits

don't necessarily line up with the branch commits, I'm writing full

log messages here; you shouldn't need to look at the branch to review

this or subsequent ported changes.

Although this change does not also add svn_fs_has_capability(), there

is a conversation about whether to add that interface too. See the

thread starting here:

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=135068

From: "David Glasser" <glasser@davidglasser.net>

To: dev@subversion.tigris.org, kfogel@tigris.org

Cc: svn@subversion.tigris.org

References: <200802130814.m1D8Egv0023316@svn2.sjc.collab.net>

Subject: Re: svn commit: r29314 - in \

branches/mergeinfo-capability/subversion: \

include libsvn_client libsvn_ra_local libsvn_ra_svn \

libsvn_repos mod_dav_svn/reports svnserve

Date: Wed, 13 Feb 2008 11:32:22 -0800

Message-ID: <1ea387f60802131132r8e45a81s5a9c6fb6118355ab@mail.gmail.com>

* subversion/include/svn_repos.h

(svn_repos_has_capability): New prototype.

(SVN_REPOS_CAPABILITY_MERGEINFO): New capability.

* subversion/libsvn_repos/repos.h

(repository_capabilities): New field.

* subversion/libsvn_repos/repos.c

(create_svn_repos_t): Initialize new repository_capabilities field.

(capability_yes, capability_no): New static constant strings.

(svn_repos_has_capability): New function.

Merge r29194 from trunk, which see for details.

* r29194

Rename an error code.

Notes:

Must be reverted on trunk if not backported.

Depends on r29193 (loosely).

Votes:

+1: glasser, epg

Also:

* STATUS

Remove this change from the approved list.

    • ?
    /branches/1.5.x/subversion/include/svn_ra.h
Merge r29193 from trunk, which see for details.

* r29193

Add "@since" tags to some error codes.

Notes:

Depends on the _svn/.svn backport (r29127 et al).

Votes:

+1: glasser, cmpilato

Also:

* STATUS

Remove this change from the approved list.

Merge r29127, r29135, r29136, r29138, r29163, r29164 from trunk, which

see for details.

* r29127, r29135, r29136, r29138, r29163, r29164

Fix issue #3026: _svn and .svn are silently ignored as file arguments.

Votes:

+1: kfogel (r29127, r29163, r29164 only)

+1: glasser, cmpilato

Also merged r29353 (whitespace-only tweaks related to the above) under

the "obvious fix" clause, and to prevent future conflicts with changes

to this area of code.

Finally:

* STATUS

Remove this change from the approved list.

    • ?
    /branches/1.5.x/subversion/svn/diff-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/lock-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/log-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/checkout-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/copy-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/util.c
    • ?
    /branches/1.5.x/subversion/svn/cl.h
    • ?
    /branches/1.5.x/subversion/svn/cat-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/propset-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/commit-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/mkdir-cmd.c
    • ?
    /branches/1.5.x/subversion/svn/propdel-cmd.c
  1. … 26 more files in changeset.
On the mergeinfo-api-cleanup branch:

Follow-up to r29347: put back an accidentally-deleted &.

(Fixes merge_tests 85.)

* subversion/libsvn_wc/props.c

(apply_single_prop_change): Oops.

* subversion/libsvn_subr/opt.c

(svn_opt_args_to_target_array2): Whitespace changes only (caught in

review for backport to 1.5.x).

Still more post-review voting.
Merged revisions 29344,29348 via svnmerge from

https://svn.collab.net/repos/svn/trunk.