[PATCH] Resolve issue 2426: Reverting relative to working copy root (sometimes) fails

[Erik Huelsmann <eh...@gmail.com>]

This patch fixes issue 2426, which is a wc-replacements regression.

I think it could use some review before I commit this though, so, if you please.

Effectively, this patch makes it possible to create relative prop-file
paths without path calculation outside of props.c.  Currently path
calculations do take place to insert relative prop paths into log
files.

Log:
[[[
Fix issue #2426: revert_tests.py test 1 fails.

* subversion/libsvn_wc/adm_files.h
* subversion/libsvn_wc/adm_files.c
  (svn_wc__wcprop_path, svn_wc__prop_path, svn_wc__prop_base_path,
   svn_wc__prop_revert_path): Change function signature to take an explicitly
  specified node kind, indicating which property file we want, instead of
  deducing that from path and adm_access.

* subversion/libsvn_wc/props.c
* subversion/libsvn_wc/diff.c
* subversion/libsvn_wc/copy.c
* subversion/libsvn_wc/adm_crawler.c
* subversion/libsvn_wc/log.c
* subversion/libsvn_wc/adm_ops.c
* subversion/libsvn_wc/update_editor.c
* subversion/libsvn_wc/questions.c:
  Adjust callers.


]]]

Re: [PATCH] Resolve issue 2426: Reverting relative to working copy root (sometimes) fails

[Ivan Zhakov <ch...@gmail.com>]

On 10/29/05, Erik Huelsmann <eh...@gmail.com> wrote:
> Now with patch...
>
> On 10/29/05, Erik Huelsmann <eh...@gmail.com> wrote:
> > This patch fixes issue 2426, which is a wc-replacements regression.
> >
> > I think it could use some review before I commit this though, so, if you please.
> >
> > Effectively, this patch makes it possible to create relative prop-file
> > paths without path calculation outside of props.c.  Currently path
> > calculations do take place to insert relative prop paths into log
> > files.
Hi Erik,
There is some small nits and one big problem: svn_wc_entry() may
return *entry=NULL without raising error. So it should be checked. I
found inserting patch inline uncomfortable, so I comment without it.

> > Log:
> > [[[
> > Fix issue #2426: revert_tests.py test 1 fails.
> >
> > * subversion/libsvn_wc/adm_files.h
> > * subversion/libsvn_wc/adm_files.c
> >   (svn_wc__wcprop_path, svn_wc__prop_path, svn_wc__prop_base_path,
> >    svn_wc__prop_revert_path): Change function signature to take an explicitly
> >   specified node kind, indicating which property file we want, instead of
> >   deducing that from path and adm_access.
Comment and docstring should say that we accept only svn_node_dir and
svn_node_file as value for kind parameter. Also I have noticed that
variable 'entry' become unused.

> > * subversion/libsvn_wc/props.c
(open_reject_tmp_file, wcprop_list,
svn_wc__has_props,svn_wc_get_prop_diffs): No check for entry==NULL.

> > * subversion/libsvn_wc/diff.c
Change in load_base_props() need more documentation. I don't
understand this change.

> > * subversion/libsvn_wc/copy.c
In function copy_file_administratively() variable 'dst_wprop'
initialized, but unused.

> > * subversion/libsvn_wc/adm_crawler.c
> > * subversion/libsvn_wc/log.c
(log_do_modify_entry)
No check for tfile_entry==NULL. I know this impossible, but anyway
this check should be for me.

> > * subversion/libsvn_wc/adm_ops.c
> > * subversion/libsvn_wc/update_editor.c
(install_file): Unused variable 'entry'.

> > * subversion/libsvn_wc/questions.c:
> >   Adjust callers.
> >
> >
> > ]]]


--
Ivan Zhakov

Re: [PATCH] Resolve issue 2426: Reverting relative to working copy root (sometimes) fails

[Erik Huelsmann <eh...@gmail.com>]

Now with patch...

On 10/29/05, Erik Huelsmann <eh...@gmail.com> wrote:
> This patch fixes issue 2426, which is a wc-replacements regression.
>
> I think it could use some review before I commit this though, so, if you please.
>
> Effectively, this patch makes it possible to create relative prop-file
> paths without path calculation outside of props.c.  Currently path
> calculations do take place to insert relative prop paths into log
> files.
>
> Log:
> [[[
> Fix issue #2426: revert_tests.py test 1 fails.
>
> * subversion/libsvn_wc/adm_files.h
> * subversion/libsvn_wc/adm_files.c
>   (svn_wc__wcprop_path, svn_wc__prop_path, svn_wc__prop_base_path,
>    svn_wc__prop_revert_path): Change function signature to take an explicitly
>   specified node kind, indicating which property file we want, instead of
>   deducing that from path and adm_access.
>
> * subversion/libsvn_wc/props.c
> * subversion/libsvn_wc/diff.c
> * subversion/libsvn_wc/copy.c
> * subversion/libsvn_wc/adm_crawler.c
> * subversion/libsvn_wc/log.c
> * subversion/libsvn_wc/adm_ops.c
> * subversion/libsvn_wc/update_editor.c
> * subversion/libsvn_wc/questions.c:
>   Adjust callers.
>
>
> ]]]
>