Author: stefan2
Date: Wed Feb 4 14:55:59 2015
New Revision: 1657264
URL: http://svn.apache.org/r1657264
Log:
In FSX, get rid of a pointless function export and fix a revision property
update bug in the process.
* subversion/libsvn_fs_x/fs_x.h
(svn_fs_x__revision_proplist): Remove function that isn't called outside
fs_x.c .
* subversion/libsvn_fs_x/fs_x.c
(svn_fs_x__revision_proplist): Remove.
(svn_fs_x__revision_prop): Call the actual implementation.
(change_rev_prop_body): Same. Also, use the correct cache control flag.
Modified:
subversion/trunk/subversion/libsvn_fs_x/fs_x.c
subversion/trunk/subversion/libsvn_fs_x/fs_x.h
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.c?rev=1657264&r1=1657263&r2=1657264&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.c Wed Feb 4 14:55:59 2015
@@ -690,17 +690,6 @@ svn_fs_x__ensure_revision_exists(svn_rev
_("No such revision %ld"), rev);
}
-svn_error_t *
-svn_fs_x__revision_proplist(apr_hash_t **proplist_p,
- svn_fs_t *fs,
- svn_revnum_t rev,
- apr_pool_t *pool)
-{
- SVN_ERR(svn_fs_x__get_revision_proplist(proplist_p, fs, rev, FALSE, pool));
-
- return SVN_NO_ERROR;
-}
-
svn_error_t *
svn_fs_x__file_length(svn_filesize_t *length,
@@ -1116,7 +1105,7 @@ svn_fs_x__revision_prop(svn_string_t **v
apr_hash_t *table;
SVN_ERR(svn_fs__check_fs(fs, TRUE));
- SVN_ERR(svn_fs_x__revision_proplist(&table, fs, rev, pool));
+ SVN_ERR(svn_fs_x__get_revision_proplist(&table, fs, rev, FALSE, pool));
*value_p = svn_hash_gets(table, propname);
@@ -1143,7 +1132,11 @@ change_rev_prop_body(void *baton,
change_rev_prop_baton_t *cb = baton;
apr_hash_t *table;
- SVN_ERR(svn_fs_x__revision_proplist(&table, cb->fs, cb->rev, scratch_pool));
+ /* Read current revprop values from disk (never from cache).
+ Even if somehow the cache got out of sync, we want to make sure that
+ we read, update and write up-to-date data. */
+ SVN_ERR(svn_fs_x__get_revision_proplist(&table, cb->fs, cb->rev, TRUE,
+ scratch_pool));
if (cb->old_value_p)
{
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.h?rev=1657264&r1=1657263&r2=1657264&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.h Wed Feb 4 14:55:59 2015
@@ -69,15 +69,6 @@ svn_fs_x__ensure_revision_exists(svn_rev
svn_fs_t *fs,
apr_pool_t *scratch_pool);
-/* Set *PROPLIST to be an apr_hash_t containing the property list of
- revision REV as seen in filesystem FS. Use POOL for temporary
- allocations. */
-svn_error_t *
-svn_fs_x__revision_proplist(apr_hash_t **proplist,
- svn_fs_t *fs,
- svn_revnum_t rev,
- apr_pool_t *pool);
-
/* Set *LENGTH to the be fulltext length of the node revision
specified by NODEREV. */
svn_error_t *
