You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/05/11 19:13:06 UTC
svn commit: r943184 - in /subversion/trunk/subversion/libsvn_wc: diff.c
props.c props.h update_editor.c
Author: julianfoad
Date: Tue May 11 17:13:05 2010
New Revision: 943184
URL: http://svn.apache.org/viewvc?rev=943184&view=rev
Log:
Rename svn_wc__load_revert_props() to svn_wc__get_revert_props() for
consistency with svn_wc__get_pristine_props() and
svn_wc__get_actual_props().
* subversion/libsvn_wc/props.h,
subversion/libsvn_wc/props.c
(svn_wc__get_pristine_props, svn_wc__get_actual_props): Tweak doc strings.
(svn_wc__load_revert_props): Rename to svn_wc__get_revert_props.
* subversion/libsvn_wc/diff.c
(file_diff): Update caller.
* subversion/libsvn_wc/update_editor.c
(add_file_with_history): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/diff.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/props.h
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=943184&r1=943183&r2=943184&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Tue May 11 17:13:05 2010
@@ -704,9 +704,9 @@ file_diff(struct dir_baton *db,
/* We don't want the normal pristine properties (which are
from the WORKING tree). We want the pristines associated
with the BASE tree, which are saved as "revert" props. */
- SVN_ERR(svn_wc__load_revert_props(&baseprops,
- eb->db, local_abspath,
- pool, pool));
+ SVN_ERR(svn_wc__get_revert_props(&baseprops,
+ eb->db, local_abspath,
+ pool, pool));
}
else
{
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=943184&r1=943183&r2=943184&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue May 11 17:13:05 2010
@@ -294,11 +294,11 @@ svn_wc__get_prejfile_abspath(const char
svn_error_t *
-svn_wc__load_revert_props(apr_hash_t **revert_props_p,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_wc__get_revert_props(apr_hash_t **revert_props_p,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
if (revert_props_p)
{
Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=943184&r1=943183&r2=943184&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Tue May 11 17:13:05 2010
@@ -170,7 +170,7 @@ svn_wc__working_props_committed(svn_wc__
apr_pool_t *scratch_pool);
-/* Internal version of svn_wc_get_pristine_props. */
+/* Internal version of svn_wc_get_pristine_props(). */
svn_error_t *
svn_wc__get_pristine_props(apr_hash_t **props,
svn_wc__db_t *db,
@@ -179,7 +179,7 @@ svn_wc__get_pristine_props(apr_hash_t **
apr_pool_t *scratch_pool);
-/* Internal version of svn_wc_prop_list2. */
+/* Internal version of svn_wc_prop_list2(). */
svn_error_t *
svn_wc__get_actual_props(apr_hash_t **props,
svn_wc__db_t *db,
@@ -192,11 +192,11 @@ svn_wc__get_actual_props(apr_hash_t **pr
Returned hash/values are allocated in RESULT_POOL. All temporary
allocations are made in SCRATCH_POOL. */
svn_error_t *
-svn_wc__load_revert_props(apr_hash_t **revert_props_p,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_wc__get_revert_props(apr_hash_t **revert_props_p,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Set *MARKED to indicate whether the versioned file at LOCAL_ABSPATH in DB
* has a "binary" file type, as indicated by its working svn:mime-type
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=943184&r1=943183&r2=943184&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue May 11 17:13:05 2010
@@ -3576,8 +3576,8 @@ add_file_with_history(const char *path,
if (src_entry->schedule == svn_wc_schedule_replace
&& src_entry->copyfrom_url)
{
- SVN_ERR(svn_wc__load_revert_props(&base_props, db,
- src_local_abspath, pool, subpool));
+ SVN_ERR(svn_wc__get_revert_props(&base_props, db,
+ src_local_abspath, pool, subpool));
/* The old working props are lost, just like the old
working file text is. Just use the base props. */
working_props = base_props;