On 11/6/05, lundblad@tigris.org <lundblad@tigris.org> wrote:
> Author: lundblad
> Date: Sat Nov 5 18:44:38 2005
> New Revision: 17211
>
> Modified:
> branches/wc-propcaching/subversion/include/svn_wc.h
> branches/wc-propcaching/subversion/libsvn_wc/adm_ops.c
> branches/wc-propcaching/subversion/libsvn_wc/entries.c
> branches/wc-propcaching/subversion/libsvn_wc/entries.h
> branches/wc-propcaching/subversion/libsvn_wc/log.c
> branches/wc-propcaching/subversion/libsvn_wc/props.c
> branches/wc-propcaching/subversion/libsvn_wc/props.h
>
> Log:
> On wc-propcaching branch: Add a flag to the entries file keeping track of
> whether properties were modified or not. Keep this flag updated and
> use it to determined whether properties are modified. Add lots of TODO
> markers in the code.
>
> NOTE: This commit breaks stat_tests 13, which tests thats certain properties
> (pun partly intended;) of property timestamps. This has to be resolved.
>
> * subversion/include/svn_wc.h (svn_wc_entry_t): Add prop_mods member.
>
> * subversion/libsvn_wc/props.c
> (svn_wc__install_props): New function. Parts factored from
> svn_wc__merge_props.
> (svn_wc__merge_props, svn_wc_prop_set2): Use svn_wc__isntall_props.
Peter, why you didn't use svn_wc__install_props() in
svn_wc__merge_prop_diffs(). This should simplify and reduce code.
Because it deprecated and not tested or you missed it?
> (svn_wc_props_modified_p): Use flag in the entry if wc format is new enough;
> else fall back to the old method.
>
> * subversion/libsvn_wc/props.h (svn_wc__install_props): New declaration.
>
> * subversion/libsvn_wc/entries.c (svn_wc__atts_to_entry): Transform
> prop_mods flag.
> (write_entry): Add prop_mods flag.
> (fold_entry): Handle prop_mods flag.
>
> * subversion/libsvn_wc/entries.h
> (SVN_WC__ENTRY_ATTR_PROP_MODS, SVN_WC__ENTRY_MODIFY_PROP_MODS): New defines.
>
> * subversion/libsvn_wc/log.c (log_do_committed): Reset prop_mods flag.
> (svn_wc__loggy_entry_modify): Add prop_mods flag to the hash.
>
> * subversion/libsvn_wc/adm_ops.c (revert_admin_things): Reset prop_Mods flag.
--
Ivan Zhakov
Received on Sat Nov 12 01:06:56 2005