Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-03 Thread Matthew Bentham
On 02/03/2010 17:18, Matthew Bentham wrote: On 02/03/2010 13:40, Matthew Bentham wrote: On 02/03/2010 13:06, Greg Stein wrote: ... On Tue, Mar 2, 2010 at 04:45, Matthew Benthamwrote: Because of the fragility around entry->copied, I can't really tell whether this patch is Right from a simpl

Re: renames/moves in wc-ng (was: (Re: [PATCH] wc-ng - Remove use of entry_t from) calculate_target_mergeinfo

2010-03-02 Thread Greg Stein
On Tue, Mar 2, 2010 at 08:48, Stefan Sperling wrote: > On Tue, Mar 02, 2010 at 07:53:30AM -0500, Greg Stein wrote: >... >> We do *not* record moves today. >> >> We *will* at some point in the future, which is most likely *after* >> the 1.7 release. > > So the question of how exactly we'll trace mo

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Matthew Bentham
On 02/03/2010 13:40, Matthew Bentham wrote: On 02/03/2010 13:06, Greg Stein wrote: On Tue, Mar 2, 2010 at 04:45, Matthew Bentham wrote: Trying to remove more uses of svn_wc_entry_t, it seems there is no way at the moment to get the equivalent of entry->copied using node routines. Is this the

renames/moves in wc-ng (was: (Re: [PATCH] wc-ng - Remove use of entry_t from) calculate_target_mergeinfo

2010-03-02 Thread Stefan Sperling
On Tue, Mar 02, 2010 at 07:53:30AM -0500, Greg Stein wrote: > On Tue, Mar 2, 2010 at 07:42, Philip Martin > wrote: > > Greg Stein writes: > > > >> Thus, the notion of moved_here is not all that relevant because I > >> would hope this function won't survive to the point where we start > >> record

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Matthew Bentham
On 02/03/2010 13:06, Greg Stein wrote: On Tue, Mar 2, 2010 at 04:45, Matthew Bentham wrote: Trying to remove more uses of svn_wc_entry_t, it seems there is no way at the moment to get the equivalent of entry->copied using node routines. Is this the sort of thing that is needed? [[[ wc-ng: wor

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Julian Foad
Matthew Bentham wrote: > Trying to remove more uses of svn_wc_entry_t, it seems there is no way > at the moment to get the equivalent of entry->copied using node > routines. Is this the sort of thing that is needed? > > [[[ > wc-ng: work towards eliminating svn_wc_entry_t > > * libsvn_wc/node.

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Julian Foad
On Tue, 2010-03-02 at 09:45 +, Matthew Bentham wrote: > Trying to remove more uses of svn_wc_entry_t, it seems there is no way > at the moment to get the equivalent of entry->copied using node > routines. Is this the sort of thing that is needed? > > [[[ > wc-ng: work towards eliminating sv

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Greg Stein
On Tue, Mar 2, 2010 at 04:45, Matthew Bentham wrote: > Trying to remove more uses of svn_wc_entry_t, it seems there is no way at > the moment to get the equivalent of entry->copied using node routines.  Is > this the sort of thing that is needed? > > [[[ > wc-ng: work towards eliminating svn_wc_en

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Greg Stein
On Tue, Mar 2, 2010 at 07:53, Greg Stein wrote: > On Tue, Mar 2, 2010 at 07:42, Philip Martin > wrote: >> Greg Stein writes: >> >>> Thus, the notion of moved_here is not all that relevant because I >>> would hope this function won't survive to the point where we start >>> recording moves in wc_

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Greg Stein
On Tue, Mar 2, 2010 at 07:42, Philip Martin wrote: > Greg Stein writes: > >> Thus, the notion of moved_here is not all that relevant because I >> would hope this function won't survive to the point where we start >> recording moves in wc_db (so, thus, we'll never record/generate that >> status).

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Philip Martin
Greg Stein writes: > Thus, the notion of moved_here is not all that relevant because I > would hope this function won't survive to the point where we start > recording moves in wc_db (so, thus, we'll never record/generate that > status). I don't understand that paragraph. Do we record moves now

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Greg Stein
On Tue, Mar 2, 2010 at 05:39, Philip Martin wrote: > Matthew Bentham writes: > >>  static svn_error_t * >>  calculate_target_mergeinfo(svn_ra_session_t *ra_session, >>                             apr_hash_t **target_mergeinfo, >>                             svn_wc_adm_access_t *adm_access, >>    

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Julian Foad
Philip Martin wrote: > Matthew Bentham writes: > > I understood the plan to be that for now we add small > > routines that call __db routines internally? > > That still leaves the question about _status_moved_here. The original > code checked entry->copied and I think that would have included m

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Philip Martin
Matthew Bentham writes: >> Perhaps calculate_target_mergeinfo should simply call _scan_addition >> to get the added/copied/moved status? > > It could do, but _scan_addition is private to libsvn_wc right now, like > _read_info (and indeed _status_copied and the other status > enumerations). Ok. I

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Matthew Bentham
On 02/03/2010 10:39, Philip Martin wrote: Matthew Bentham writes: +svn_wc__node_is_status_copied(svn_boolean_t *is_copied, + svn_wc_context_t *wc_ctx, + const char *local_abspath, + apr_pool_t *scratch_pool)

Re: [PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Philip Martin
Matthew Bentham writes: > static svn_error_t * > calculate_target_mergeinfo(svn_ra_session_t *ra_session, > apr_hash_t **target_mergeinfo, > svn_wc_adm_access_t *adm_access, > const char *src_path_or_url, >

[PATCH] wc-ng - Remove use of entry_t from calculate_target_mergeinfo

2010-03-02 Thread Matthew Bentham
Trying to remove more uses of svn_wc_entry_t, it seems there is no way at the moment to get the equivalent of entry->copied using node routines. Is this the sort of thing that is needed? [[[ wc-ng: work towards eliminating svn_wc_entry_t * libsvn_wc/node.c, include/private/svn_wc_private.h