You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/12/19 22:15:15 UTC
svn commit: r1220949 - in
/subversion/branches/fs-py/subversion/libsvn_fs_py: fs_fs.c rep-cache.c
rep-cache.h tree.c tree.h
Author: hwright
Date: Mon Dec 19 21:15:14 2011
New Revision: 1220949
URL: http://svn.apache.org/viewvc?rev=1220949&view=rev
Log:
On the fs-py branch:
Rename new functions introduced through the merge in r1220946 to use the
'svn_fs_py' prefix, and update their callers.
Modified:
subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c
subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c
subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.h
subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c
subversion/branches/fs-py/subversion/libsvn_fs_py/tree.h
Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c?rev=1220949&r1=1220948&r2=1220949&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/fs_fs.c Mon Dec 19 21:15:14 2011
@@ -6361,7 +6361,7 @@ recover_body(void *baton, apr_pool_t *po
/* Prune younger-than-(newfound-youngest) revisions from the rep cache. */
if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
- SVN_ERR(svn_fs_fs__del_rep_reference(fs, max_rev, pool));
+ SVN_ERR(svn_fs_py__del_rep_reference(fs, max_rev, pool));
/* Now store the discovered youngest revision, and the next IDs if
relevant, in a new 'current' file. */
@@ -7688,7 +7688,7 @@ hotcopy_body(void *baton, apr_pool_t *po
if (kind == svn_node_file)
{
SVN_ERR(svn_sqlite__hotcopy(src_subdir, dst_subdir, pool));
- SVN_ERR(svn_fs_fs__del_rep_reference(dst_fs, dst_youngest, pool));
+ SVN_ERR(svn_fs_py__del_rep_reference(dst_fs, dst_youngest, pool));
}
}
Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c?rev=1220949&r1=1220948&r2=1220949&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.c Mon Dec 19 21:15:14 2011
@@ -338,7 +338,7 @@ svn_fs_py__set_rep_reference(svn_fs_t *f
svn_error_t *
-svn_fs_fs__del_rep_reference(svn_fs_t *fs,
+svn_fs_py__del_rep_reference(svn_fs_t *fs,
svn_revnum_t youngest,
apr_pool_t *pool)
{
Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.h?rev=1220949&r1=1220948&r2=1220949&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.h (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/rep-cache.h Mon Dec 19 21:15:14 2011
@@ -82,7 +82,7 @@ svn_fs_py__set_rep_reference(svn_fs_t *f
/* Delete from the cache all reps corresponding to revisions younger
than YOUNGEST. */
svn_error_t *
-svn_fs_fs__del_rep_reference(svn_fs_t *fs,
+svn_fs_py__del_rep_reference(svn_fs_t *fs,
svn_revnum_t youngest,
apr_pool_t *pool);
Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c?rev=1220949&r1=1220948&r2=1220949&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/tree.c Mon Dec 19 21:15:14 2011
@@ -713,7 +713,7 @@ add_change(svn_fs_t *fs,
/* Get the id of a node referenced by path PATH in ROOT. Return the
id in *ID_P allocated in POOL. */
svn_error_t *
-svn_fs_fs__node_id(const svn_fs_id_t **id_p,
+svn_fs_py__node_id(const svn_fs_id_t **id_p,
svn_fs_root_t *root,
const char *path,
apr_pool_t *pool)
@@ -781,7 +781,7 @@ node_kind(svn_node_kind_t *kind_p,
dag_node_t *node;
/* Get the node id. */
- SVN_ERR(svn_fs_fs__node_id(&node_id, root, path, pool));
+ SVN_ERR(svn_fs_py__node_id(&node_id, root, path, pool));
/* Use the node id to get the real kind. */
SVN_ERR(svn_fs_py__dag_get_node(&node, root->fs, node_id, pool));
@@ -2797,7 +2797,7 @@ fs_node_origin_rev(svn_revnum_t *revisio
path = svn_fs__canonicalize_abspath(path, pool);
/* Check the cache first. */
- SVN_ERR(svn_fs_fs__node_id(&given_noderev_id, root, path, pool));
+ SVN_ERR(svn_fs_py__node_id(&given_noderev_id, root, path, pool));
node_id = svn_fs_py__id_node_id(given_noderev_id);
/* Is it a brand new uncommitted node? */
@@ -2869,7 +2869,7 @@ fs_node_origin_rev(svn_revnum_t *revisio
}
/* Walk the predecessor links back to origin. */
- SVN_ERR(svn_fs_fs__node_id(&pred_id, curroot, lastpath->data, predidpool));
+ SVN_ERR(svn_fs_py__node_id(&pred_id, curroot, lastpath->data, predidpool));
do
{
svn_pool_clear(subpool);
@@ -3513,7 +3513,7 @@ static root_vtable_t root_vtable = {
fs_paths_changed,
svn_fs_py__check_path,
fs_node_history,
- svn_fs_fs__node_id,
+ svn_fs_py__node_id,
svn_fs_py__node_created_rev,
fs_node_origin_rev,
fs_node_created_path,
Modified: subversion/branches/fs-py/subversion/libsvn_fs_py/tree.h
URL: http://svn.apache.org/viewvc/subversion/branches/fs-py/subversion/libsvn_fs_py/tree.h?rev=1220949&r1=1220948&r2=1220949&view=diff
==============================================================================
--- subversion/branches/fs-py/subversion/libsvn_fs_py/tree.h (original)
+++ subversion/branches/fs-py/subversion/libsvn_fs_py/tree.h Mon Dec 19 21:15:14 2011
@@ -63,7 +63,7 @@ svn_fs_py__check_path(svn_node_kind_t *k
/* Implement root_vtable_t.node_id(). */
svn_error_t *
-svn_fs_fs__node_id(const svn_fs_id_t **id_p,
+svn_fs_py__node_id(const svn_fs_id_t **id_p,
svn_fs_root_t *root,
const char *path,
apr_pool_t *pool);