You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/10/27 09:59:51 UTC
svn commit: r1710749 - in /subversion/trunk/subversion/libsvn_fs:
deprecated.c fs-loader.c
Author: ivan
Date: Tue Oct 27 08:59:50 2015
New Revision: 1710749
URL: http://svn.apache.org/viewvc?rev=1710749&view=rev
Log:
Move deprecated libsvn_fs functions to deprecated.c.
Suggested by: rhuijben
* subversion/libsvn_fs/fs-loader.c
(svn_fs_create, svn_fs_open, svn_fs_node_history, svn_fs_get_mergeinfo,
svn_fs_history_prev): Move from here...
* subversion/libsvn_fs/deprecated.c:
(svn_fs_create, svn_fs_open, svn_fs_node_history, svn_fs_get_mergeinfo,
svn_fs_history_prev): ...to here.
Modified:
subversion/trunk/subversion/libsvn_fs/deprecated.c
subversion/trunk/subversion/libsvn_fs/fs-loader.c
Modified: subversion/trunk/subversion/libsvn_fs/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/deprecated.c?rev=1710749&r1=1710748&r2=1710749&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_fs/deprecated.c Tue Oct 27 08:59:50 2015
@@ -103,6 +103,55 @@ svn_fs_get_locks(svn_fs_t *fs, const cha
pool));
}
+svn_error_t *
+svn_fs_create(svn_fs_t **fs_p,
+ const char *path,
+ apr_hash_t *fs_config,
+ apr_pool_t *pool)
+{
+ return svn_fs_create2(fs_p, path, fs_config, pool, pool);
+}
+
+svn_error_t *
+svn_fs_open(svn_fs_t **fs_p,
+ const char *path,
+ apr_hash_t *fs_config,
+ apr_pool_t *pool)
+{
+ return svn_fs_open2(fs_p, path, fs_config, pool, pool);
+}
+
+svn_error_t *
+svn_fs_node_history(svn_fs_history_t **history_p, svn_fs_root_t *root,
+ const char *path, apr_pool_t *pool)
+{
+ return svn_error_trace(svn_fs_node_history2(history_p, root, path,
+ pool, pool));
+}
+
+svn_error_t *
+svn_fs_get_mergeinfo(svn_mergeinfo_catalog_t *catalog,
+ svn_fs_root_t *root,
+ const apr_array_header_t *paths,
+ svn_mergeinfo_inheritance_t inherit,
+ svn_boolean_t include_descendants,
+ apr_pool_t *pool)
+{
+ return svn_error_trace(svn_fs_get_mergeinfo2(catalog, root, paths,
+ inherit,
+ include_descendants,
+ TRUE, pool, pool));
+}
+
+svn_error_t *
+svn_fs_history_prev(svn_fs_history_t **prev_history_p,
+ svn_fs_history_t *history, svn_boolean_t cross_copies,
+ apr_pool_t *pool)
+{
+ return svn_error_trace(svn_fs_history_prev2(prev_history_p, history,
+ cross_copies, pool, pool));
+}
+
/*** From access.c ***/
svn_error_t *
svn_fs_access_add_lock_token(svn_fs_access_t *access_ctx,
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1710749&r1=1710748&r2=1710749&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Tue Oct 27 08:59:50 2015
@@ -534,15 +534,6 @@ svn_fs_create2(svn_fs_t **fs_p,
}
svn_error_t *
-svn_fs_create(svn_fs_t **fs_p,
- const char *path,
- apr_hash_t *fs_config,
- apr_pool_t *pool)
-{
- return svn_fs_create2(fs_p, path, fs_config, pool, pool);
-}
-
-svn_error_t *
svn_fs_open2(svn_fs_t **fs_p, const char *path, apr_hash_t *fs_config,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -559,15 +550,6 @@ svn_fs_open2(svn_fs_t **fs_p, const char
}
svn_error_t *
-svn_fs_open(svn_fs_t **fs_p,
- const char *path,
- apr_hash_t *fs_config,
- apr_pool_t *pool)
-{
- return svn_fs_open2(fs_p, path, fs_config, pool, pool);
-}
-
-svn_error_t *
svn_fs_upgrade2(const char *path,
svn_fs_upgrade_notify_t notify_func,
void *notify_baton,
@@ -1113,14 +1095,6 @@ svn_fs_node_history2(svn_fs_history_t **
}
svn_error_t *
-svn_fs_node_history(svn_fs_history_t **history_p, svn_fs_root_t *root,
- const char *path, apr_pool_t *pool)
-{
- return svn_error_trace(svn_fs_node_history2(history_p, root, path,
- pool, pool));
-}
-
-svn_error_t *
svn_fs_is_dir(svn_boolean_t *is_dir, svn_fs_root_t *root, const char *path,
apr_pool_t *pool)
{
@@ -1281,20 +1255,6 @@ svn_fs_get_mergeinfo2(svn_mergeinfo_cata
}
svn_error_t *
-svn_fs_get_mergeinfo(svn_mergeinfo_catalog_t *catalog,
- svn_fs_root_t *root,
- const apr_array_header_t *paths,
- svn_mergeinfo_inheritance_t inherit,
- svn_boolean_t include_descendants,
- apr_pool_t *pool)
-{
- return svn_error_trace(svn_fs_get_mergeinfo2(catalog, root, paths,
- inherit,
- include_descendants,
- TRUE, pool, pool));
-}
-
-svn_error_t *
svn_fs__get_mergeinfo_for_path(svn_mergeinfo_t *mergeinfo,
svn_fs_root_t *root,
const char *path,
@@ -1893,15 +1853,6 @@ svn_fs_history_prev2(svn_fs_history_t **
}
svn_error_t *
-svn_fs_history_prev(svn_fs_history_t **prev_history_p,
- svn_fs_history_t *history, svn_boolean_t cross_copies,
- apr_pool_t *pool)
-{
- return svn_error_trace(svn_fs_history_prev2(prev_history_p, history,
- cross_copies, pool, pool));
-}
-
-svn_error_t *
svn_fs_history_location(const char **path, svn_revnum_t *revision,
svn_fs_history_t *history, apr_pool_t *pool)
{