Author: hwright
Date: Thu Jun 24 14:23:21 2010
New Revision: 957553
URL: http://svn.apache.org/viewvc?rev=957553&view=rev
Log:
Change the API for svn_wc__get_entry_versioned() to take a wc_db, rather than
a wc_ctx, now that the function is library-internal.
* subversion/libsvn_wc/deprecated.c
(svn_wc__entry_versioned_internal): Update caller.
* subversion/libsvn_wc/entries.c
(svn_wc__get_entry_versioned): Change our param list, and what we pass down
the stack.
* subversion/libsvn_wc/copy.c
(svn_wc_copy3): Update callers.
* subversion/libsvn_wc/entries.h
(svn_wc__get_entry_versioned): Update param.
* subversion/libsvn_wc/node.c
(svn_wc__node_get_info_bits): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/copy.c
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/entries.h
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=957553&r1=957552&r2=957553&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Thu Jun 24 14:23:21 2010
@@ -606,10 +606,10 @@ svn_wc_copy3(svn_wc_context_t *wc_ctx,
svn_dirent_split(dst_abspath, &dstdir_abspath, &dst_basename, scratch_pool);
- SVN_ERR(svn_wc__get_entry_versioned(&dst_entry, wc_ctx, dstdir_abspath,
+ SVN_ERR(svn_wc__get_entry_versioned(&dst_entry, wc_ctx->db, dstdir_abspath,
svn_node_dir, FALSE, FALSE,
scratch_pool, scratch_pool));
- SVN_ERR(svn_wc__get_entry_versioned(&src_entry, wc_ctx, src_abspath,
+ SVN_ERR(svn_wc__get_entry_versioned(&src_entry, wc_ctx->db, src_abspath,
svn_node_unknown, FALSE, FALSE,
scratch_pool, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=957553&r1=957552&r2=957553&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Thu Jun 24 14:23:21 2010
@@ -3884,22 +3884,16 @@ svn_wc__entry_versioned_internal(const s
int caller_lineno,
apr_pool_t *pool)
{
- svn_wc_context_t *wc_ctx;
const char *local_abspath;
- SVN_ERR(svn_wc__context_create_with_db(&wc_ctx, NULL,
- svn_wc__adm_get_db(adm_access),
- pool));
-
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- SVN_ERR(svn_wc__get_entry_versioned(entry, wc_ctx, local_abspath,
- svn_node_unknown, show_hidden,
+ SVN_ERR(svn_wc__get_entry_versioned(entry, svn_wc__adm_get_db(adm_access),
+ local_abspath, svn_node_unknown,
+ show_hidden,
FALSE, /* NEED_PARENT_STUB */
pool, pool));
- SVN_ERR(svn_wc_context_destroy(wc_ctx));
-
return SVN_NO_ERROR;
}
#endif
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=957553&r1=957552&r2=957553&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Thu Jun 24 14:23:21 2010
@@ -1528,7 +1528,7 @@ svn_wc__get_entry(const svn_wc_entry_t *
svn_error_t *
svn_wc__get_entry_versioned(const svn_wc_entry_t **entry,
- svn_wc_context_t *wc_ctx,
+ svn_wc__db_t *db,
const char *local_abspath,
svn_node_kind_t kind,
svn_boolean_t show_hidden,
@@ -1543,7 +1543,7 @@ svn_wc__get_entry_versioned(const svn_wc
/* We call this with allow_unversioned=TRUE, since the error returned is
different than our callers currently expect. We catch the NULL entry
below and return the correct error. */
- err = svn_wc__get_entry(entry, wc_ctx->db, local_abspath, TRUE, kind,
+ err = svn_wc__get_entry(entry, db, local_abspath, TRUE, kind,
need_parent_stub, result_pool, scratch_pool);
if (err && (err->apr_err == SVN_ERR_WC_MISSING
|| err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND
Modified: subversion/trunk/subversion/libsvn_wc/entries.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.h?rev=957553&r1=957552&r2=957553&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.h (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.h Thu Jun 24 14:23:21 2010
@@ -153,7 +153,7 @@ svn_wc__get_entry(const svn_wc_entry_t *
*/
svn_error_t *
svn_wc__get_entry_versioned(const svn_wc_entry_t **entry,
- svn_wc_context_t *wc_ctx,
+ svn_wc__db_t *db,
const char *local_abspath,
svn_node_kind_t kind,
svn_boolean_t show_hidden,
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=957553&r1=957552&r2=957553&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Jun 24 14:23:21 2010
@@ -1150,7 +1150,7 @@ svn_wc__node_get_info_bits(svn_wc_schedu
{
const svn_wc_entry_t *entry;
- SVN_ERR(svn_wc__get_entry_versioned(&entry, wc_ctx, local_abspath,
+ SVN_ERR(svn_wc__get_entry_versioned(&entry, wc_ctx->db, local_abspath,
svn_node_unknown, TRUE, FALSE,
result_pool, scratch_pool));
