[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r946689 - in /subversion/trunk/subversion/libsvn_wc: adm_files.c adm_files.h update_editor.c

From: Greg Stein <gstein_at_gmail.com>
Date: Thu, 20 May 2010 15:24:57 -0400

What the heck is this new terminology?

I don't understand how "ultimate" is suddenly better than "pristine".
We're talking about pristine content here!?!

I really do not see the purpose in this sudden growth of new names for
existing concepts/semantics. To me, this is just creating more
confusion. "What's an ultimate? How is this different from a pristine?
What is an ultimate? I don't see that in wc_db.h anywhere. I don't see
it in notes/wc-ng. I don't see this anywhere... What is this solving?"

Lots of questions arise when substituting a new name for something
existing. How is this different?

On Thu, May 20, 2010 at 12:22, <julianfoad_at_apache.org> wrote:
> Author: julianfoad
> Date: Thu May 20 16:22:01 2010
> New Revision: 946689
>
> URL: http://svn.apache.org/viewvc?rev=946689&view=rev
> Log:
> Rename svn_wc__get_pristine_base_contents() to
> svn_wc__get_ultimate_base_contents(), in line with the name
> svn_wc__ultimate_base_text_path().
>
> * subversion/libsvn_wc/adm_files.h,
>  subversion/libsvn_wc/adm_files.c
>  (svn_wc__get_ultimate_base_contents): New name for
>    svn_wc__get_pristine_base_contents().
>
> * subversion/libsvn_wc/update_editor.c
>  (add_file_with_history, apply_textdelta): Adjust callers.
>
> Modified:
>    subversion/trunk/subversion/libsvn_wc/adm_files.c
>    subversion/trunk/subversion/libsvn_wc/adm_files.h
>    subversion/trunk/subversion/libsvn_wc/update_editor.c
>
> Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=946689&r1=946688&r2=946689&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/adm_files.c Thu May 20 16:22:01 2010
> @@ -325,7 +325,7 @@ svn_wc__ultimate_base_text_path_to_read(
>
>
>  svn_error_t *
> -svn_wc__get_pristine_base_contents(svn_stream_t **contents,
> +svn_wc__get_ultimate_base_contents(svn_stream_t **contents,
>                                    svn_wc__db_t *db,
>                                    const char *local_abspath,
>                                    apr_pool_t *result_pool,
>
> Modified: subversion/trunk/subversion/libsvn_wc/adm_files.h
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.h?rev=946689&r1=946688&r2=946689&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/adm_files.h (original)
> +++ subversion/trunk/subversion/libsvn_wc/adm_files.h Thu May 20 16:22:01 2010
> @@ -114,7 +114,7 @@ svn_wc__get_pristine_contents(svn_stream
>  * file is locally added), set *CONTENTS to NULL.
>  * The base version of LOCAL_ABSPATH must be a file. */
>  svn_error_t *
> -svn_wc__get_pristine_base_contents(svn_stream_t **contents,
> +svn_wc__get_ultimate_base_contents(svn_stream_t **contents,
>                                    svn_wc__db_t *db,
>                                    const char *local_abspath,
>                                    apr_pool_t *result_pool,
>
> Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=946689&r1=946688&r2=946689&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu May 20 16:22:01 2010
> @@ -3559,7 +3559,7 @@ add_file_with_history(const char *path,
>       SVN_ERR(svn_wc__get_entry(&src_entry, db, src_local_abspath, FALSE,
>                             svn_node_file, FALSE, subpool, subpool));
>
> -      SVN_ERR(svn_wc__get_pristine_base_contents(&source_text_base,
> +      SVN_ERR(svn_wc__get_ultimate_base_contents(&source_text_base,
>                                                  db, src_local_abspath,
>                                                  subpool, subpool));
>
> @@ -4117,7 +4117,7 @@ apply_textdelta(void *file_baton,
>
>   if (! fb->adding_file)
>     {
> -      SVN_ERR(svn_wc__get_pristine_base_contents(&source, fb->edit_baton->db,
> +      SVN_ERR(svn_wc__get_ultimate_base_contents(&source, fb->edit_baton->db,
>                                                  fb->local_abspath,
>                                                  handler_pool, handler_pool));
>       if (source == NULL)
>
>
>
Received on 2010-05-20 21:25:24 CEST

This is an archived mail posted to the Subversion Dev mailing list.