Author: rhuijben
Date: Thu Nov 29 14:45:31 2012
New Revision: 1415187
URL: http://svn.apache.org/viewvc?rev=1415187&view=rev
Log:
In the wc diff editor: Read properties directly from the wc_db api.
* subversion/libsvn_wc/diff_editor.c
(file_diff,
report_wc_file_as_added,
report_wc_directory_as_added,
delete_entry): Read properties directly.
(close_directory): Read properties directly. Read the real BASE
properties when determining the server side changes.
Modified:
subversion/trunk/subversion/libsvn_wc/diff_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1415187&r1=1415186&r2=1415187&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Thu Nov 29 14:45:31 2012
@@ -610,8 +610,8 @@ file_diff(struct edit_baton *eb,
apr_hash_t *baseprops;
/* Get svn:mime-type from pristine props (in BASE or WORKING) of PATH. */
- SVN_ERR(svn_wc__get_pristine_props(&baseprops, db, local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_read_pristine_props(&baseprops, db, local_abspath,
+ scratch_pool, scratch_pool));
if (baseprops)
base_mimetype = get_prop_mimetype(baseprops);
else
@@ -731,8 +731,8 @@ file_diff(struct edit_baton *eb,
|| status == svn_wc__db_status_copied
|| status == svn_wc__db_status_moved_here);
- SVN_ERR(svn_wc__get_pristine_props(&baseprops, db, local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_read_pristine_props(&baseprops, db, local_abspath,
+ scratch_pool, scratch_pool));
/* baseprops will be NULL for added nodes */
if (!baseprops)
@@ -984,8 +984,8 @@ report_wc_file_as_added(struct edit_bato
emptyprops = apr_hash_make(scratch_pool);
if (eb->use_text_base)
- SVN_ERR(svn_wc__get_pristine_props(&wcprops, db, local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_read_pristine_props(&wcprops, db, local_abspath,
+ scratch_pool, scratch_pool));
else
SVN_ERR(svn_wc__get_actual_props(&wcprops, db, local_abspath,
scratch_pool, scratch_pool));
@@ -1059,8 +1059,8 @@ report_wc_directory_as_added(struct edit
eb->changelist_hash, scratch_pool))
{
if (eb->use_text_base)
- SVN_ERR(svn_wc__get_pristine_props(&wcprops, db, local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_read_pristine_props(&wcprops, db, local_abspath,
+ scratch_pool, scratch_pool));
else
SVN_ERR(svn_wc__get_actual_props(&wcprops, db, local_abspath,
scratch_pool, scratch_pool));
@@ -1232,8 +1232,9 @@ delete_entry(const char *path,
SVN_ERR(get_pristine_file(&textbase, db, local_abspath,
eb->use_text_base, pool, pool));
- SVN_ERR(svn_wc__get_pristine_props(&baseprops, eb->db, local_abspath,
- pool, pool));
+ SVN_ERR(svn_wc__db_read_pristine_props(&baseprops,
+ eb->db, local_abspath,
+ pool, pool));
base_mimetype = get_prop_mimetype(baseprops);
SVN_ERR(eb->callbacks->file_deleted(NULL, NULL, path,
@@ -1354,9 +1355,10 @@ close_directory(void *dir_baton,
{
if (db->eb->use_text_base)
{
- SVN_ERR(svn_wc__get_pristine_props(&originalprops,
- eb->db, db->local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_read_pristine_props(&originalprops,
+ eb->db, db->local_abspath,
+ scratch_pool,
+ scratch_pool));
}
else
{
@@ -1367,9 +1369,9 @@ close_directory(void *dir_baton,
scratch_pool, scratch_pool));
/* Load the BASE and repository directory properties. */
- SVN_ERR(svn_wc__get_pristine_props(&base_props,
- eb->db, db->local_abspath,
- scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__db_base_get_props(&base_props,
+ eb->db, db->local_abspath,
+ scratch_pool, scratch_pool));
repos_props = apply_propchanges(base_props, db->propchanges);
