Author: stefan2
Date: Sat Sep 8 13:51:39 2012
New Revision: 1382304
URL: http://svn.apache.org/viewvc?rev=1382304&view=rev
Log:
Fix a minor issue with props deltification: Deltify against a props
representation instead of some text rep.
* subversion/libsvn_fs_fs/fs_fs.c
(choose_delta_base, write_hash_delta_rep): add "props" flag to parameters
(rep_write_get_baton, write_final_rev): update callers
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1382304&r1=1382303&r2=1382304&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Sat Sep 8 13:51:39 2012
@@ -6782,11 +6782,14 @@ rep_write_contents(void *baton,
/* Given a node-revision NODEREV in filesystem FS, return the
representation in *REP to use as the base for a text representation
- delta. Perform temporary allocations in *POOL. */
+ delta if PROPS is FALSE. If PROPS has been set, a suitable props
+ base representation will be returned. Perform temporary allocations
+ in *POOL. */
static svn_error_t *
choose_delta_base(representation_t **rep,
svn_fs_t *fs,
node_revision_t *noderev,
+ svn_boolean_t props,
apr_pool_t *pool)
{
int count;
@@ -6835,7 +6838,8 @@ choose_delta_base(representation_t **rep
SVN_ERR(svn_fs_fs__get_node_revision(&base, fs,
base->predecessor_id, pool));
- *rep = base->data_rep;
+ /* return a suitable base representation */
+ *rep = props ? base->prop_rep : base->data_rep;
return SVN_NO_ERROR;
}
@@ -6882,7 +6886,7 @@ rep_write_get_baton(struct rep_write_bat
SVN_ERR(get_file_offset(&b->rep_offset, file, b->pool));
/* Get the base for this delta. */
- SVN_ERR(choose_delta_base(&base_rep, fs, noderev, b->pool));
+ SVN_ERR(choose_delta_base(&base_rep, fs, noderev, FALSE, b->pool));
SVN_ERR(read_representation(&source, fs, base_rep, b->pool));
/* Write out the rep header. */
@@ -7301,7 +7305,8 @@ write_hash_rep(representation_t *rep,
is not NULL, it will be used in addition to the on-disk cache to find
earlier reps with the same content. When such existing reps can be found,
we will truncate the one just written from the file and return the existing
- rep. Perform temporary allocations in POOL. */
+ rep. If PROPS is set, assume that we want to a props representation as
+ the base for our delta. Perform temporary allocations in POOL. */
static svn_error_t *
write_hash_delta_rep(representation_t *rep,
apr_file_t *file,
@@ -7309,6 +7314,7 @@ write_hash_delta_rep(representation_t *r
svn_fs_t *fs,
node_revision_t *noderev,
apr_hash_t *reps_hash,
+ svn_boolean_t props,
apr_pool_t *pool)
{
svn_txdelta_window_handler_t diff_wh;
@@ -7329,7 +7335,7 @@ write_hash_delta_rep(representation_t *r
int diff_version = ffd->format >= SVN_FS_FS__MIN_SVNDIFF1_FORMAT ? 1 : 0;
/* Get the base for this delta. */
- SVN_ERR(choose_delta_base(&base_rep, fs, noderev, pool));
+ SVN_ERR(choose_delta_base(&base_rep, fs, noderev, props, pool));
SVN_ERR(read_representation(&source, fs, base_rep, pool));
SVN_ERR(get_file_offset(&rep->offset, file, pool));
@@ -7564,7 +7570,7 @@ write_final_rev(const svn_fs_id_t **new_
if (ffd->deltify_directories)
SVN_ERR(write_hash_delta_rep(noderev->data_rep, file,
str_entries, fs, noderev, NULL,
- pool));
+ FALSE, pool));
else
SVN_ERR(write_hash_rep(noderev->data_rep, file, str_entries,
fs, NULL, pool));
@@ -7603,7 +7609,7 @@ write_final_rev(const svn_fs_id_t **new_
if (ffd->deltify_properties)
SVN_ERR(write_hash_delta_rep(noderev->prop_rep, file,
proplist, fs, noderev, reps_hash,
- pool));
+ TRUE, pool));
else
SVN_ERR(write_hash_rep(noderev->prop_rep, file, proplist,
fs, reps_hash, pool));
