On Mon, 2008-11-10 at 06:39 -0800, Greg Stein wrote:
> Do the three OUT parameters need to be optional? I note you're passing
> NULL in the invocations, but will the typical (or all) invocations
> pass the values? If so, then we can get rid of the additional "if
> (contentstate)" type of complexity.
The parameters are optional because they are only useful when the "diff
callbacks" are used with merge, or perhaps with "diff --summarize", but
not when they are used with normal diff. Also to keep dir_closed()
consistent with all the other diff callbacks.
- Julian
> On Sun, Nov 9, 2008 at 10:30 PM, <neels_at_tigris.org> wrote:
> > Author: neels
> > Date: Sun Nov 9 22:30:27 2008
> > New Revision: 34121
> >
> > Log:
> > Mend the re-addition of the dir_closed callback into
> > svn_wc_diff_callbacks3_t. Principally, there's a need for this callback
> > to be able to notify all changes at once on a directory. Thus, put
> > dir_closed() in a position to give complete notification information.
> > Anticipating to return svn_wc_notify_state_unknown in other callback
> > functions to skip notification there if needed, to return a complete state
> > via dir_closed().
> >
> > The callers of the diff callbacks don't handle that yet, though. Future
> > users of dir_closed() will determine detailed behaviour and still have to
> > implement it.
> >
> > * subversion/include/svn_wc.h
> > (svn_wc_diff_callbacks3_t): Have both *CONTENTSTATE and *PROPSTATE return
> > values in the function signature. Fix the comment.
> >
> > * subversion/libsvn_client/repos_diff.c
> > (close_directory):
> > Apply dir_closed() signature change. Don't pass any pointers to
> > dir_closed() yet, to avoid overwriting previous states. Future
> > users of dir_closed() will have to decide what to do here.
> >
> > * subversion/libsvn_client/diff.c
> > (diff_dir_closed): Apply dir_closed() signature change.
> >
> > * subversion/libsvn_client/merge.c
> > (merge_dir_closed): Apply dir_closed() signature change.
> >
> > * subversion/libsvn_wc/deprecated.c
> > (dir_closed): Apply dir_closed() signature change.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-10 16:01:54 CET