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/05/04 22:03:25 UTC
svn commit: r1099579 - in /subversion/trunk/subversion/libsvn_wc: info.c
node.c wc.h
Author: hwright
Date: Wed May 4 20:03:24 2011
New Revision: 1099579
URL: http://svn.apache.org/viewvc?rev=1099579&view=rev
Log:
Add another libsvn_wc-internal varient of a node function for use in info.
* subversion/libsvn_wc/wc.h
(svn_wc__internal_get_repos_info): New.
* subversion/libsvn_wc/info.c
(build_info_for_entry): Use the internal function.
* subversion/libsvn_wc/node.c
(svn_wc__internal_get_repos_info): New.
(svn_wc__node_get_repos_info): Wrap the library-internal version.
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/wc.h
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1099579&r1=1099578&r2=1099579&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Wed May 4 20:03:24 2011
@@ -87,10 +87,10 @@ build_info_for_entry(svn_info2_t **info,
/* If we didn't get an origin, get it directly */
if (!tmpinfo->repos_root_URL)
{
- SVN_ERR(svn_wc__node_get_repos_info(&tmpinfo->repos_root_URL,
- &tmpinfo->repos_UUID,
- wc_ctx, local_abspath, TRUE, TRUE,
- result_pool, scratch_pool));
+ SVN_ERR(svn_wc__internal_get_repos_info(&tmpinfo->repos_root_URL,
+ &tmpinfo->repos_UUID,
+ wc_ctx->db, local_abspath, TRUE,
+ TRUE, result_pool, scratch_pool));
}
if (repos_relpath)
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1099579&r1=1099578&r2=1099579&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Wed May 4 20:03:24 2011
@@ -139,14 +139,14 @@ svn_wc__node_get_children(const apr_arra
svn_error_t *
-svn_wc__node_get_repos_info(const char **repos_root_url,
- const char **repos_uuid,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_boolean_t scan_added,
- svn_boolean_t scan_deleted,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_wc__internal_get_repos_info(const char **repos_root_url,
+ const char **repos_uuid,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ svn_boolean_t scan_added,
+ svn_boolean_t scan_deleted,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_error_t *err;
svn_wc__db_status_t status;
@@ -157,7 +157,7 @@ svn_wc__node_get_repos_info(const char *
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL,
- wc_ctx->db, local_abspath, result_pool,
+ db, local_abspath, result_pool,
scratch_pool);
if (err)
{
@@ -183,7 +183,7 @@ svn_wc__node_get_repos_info(const char *
&status, NULL,
NULL, repos_root_url, repos_uuid,
NULL, NULL, NULL, NULL,
- wc_ctx->db, local_abspath,
+ db, local_abspath,
result_pool, scratch_pool));
}
@@ -198,7 +198,7 @@ svn_wc__node_get_repos_info(const char *
|| (scan_deleted && (status == svn_wc__db_status_deleted))))
{
SVN_ERR(svn_wc__db_scan_base_repos(NULL, repos_root_url, repos_uuid,
- wc_ctx->db, local_abspath,
+ db, local_abspath,
result_pool, scratch_pool));
}
/* else maybe a deletion, or an addition w/ SCAN_ADDED==FALSE. */
@@ -206,6 +206,21 @@ svn_wc__node_get_repos_info(const char *
return SVN_NO_ERROR;
}
+svn_error_t *
+svn_wc__node_get_repos_info(const char **repos_root_url,
+ const char **repos_uuid,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ svn_boolean_t scan_added,
+ svn_boolean_t scan_deleted,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ return svn_error_return(svn_wc__internal_get_repos_info(
+ repos_root_url, repos_uuid, wc_ctx->db, local_abspath, scan_added,
+ scan_deleted, result_pool, scratch_pool));
+}
+
/* Convert DB_KIND into the appropriate NODE_KIND value.
* If SHOW_HIDDEN is TRUE, report the node kind as found in the DB
* even if DB_STATUS indicates that the node is hidden.
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1099579&r1=1099578&r2=1099579&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Wed May 4 20:03:24 2011
@@ -664,6 +664,17 @@ svn_wc__internal_get_commit_base_rev(svn
apr_pool_t *scratch_pool);
+/* Internal version of svn_wc__node_get_repos_info() */
+svn_error_t *
+svn_wc__internal_get_repos_info(const char **repos_root_url,
+ const char **repos_uuid,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ svn_boolean_t scan_added,
+ svn_boolean_t scan_deleted,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
/* Upgrade the wc sqlite database given in SDB for the wc located at
WCROOT_ABSPATH. It's current/starting format is given by START_FORMAT.
After the upgrade is complete (to as far as the automatic upgrade will