Author: rhuijben
Date: Tue Jun 22 14:35:46 2010
New Revision: 956908
URL: http://svn.apache.org/viewvc?rev=956908&view=rev
Log:
Move an internal function that is only called from one specific deprecated
function into that deprecated function.
* subversion/libsvn_wc/adm_ops.c
(svn_wc__internal_get_ancestry): Remove function, moving code to
svn_wc_get_ancestry.
* subversion/libsvn_wc/deprecated.c
(includes): Add entries.h
(svn_wc_get_ancestry): Move entry read and copy code here.
* subversion/libsvn_wc/wc.h
(svn_wc__internal_get_ancestry): Remove function.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/wc.h
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=956908&r1=956907&r2=956908&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Jun 22 14:35:46 2010
@@ -1321,31 +1321,6 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
return SVN_NO_ERROR;
}
-
-svn_error_t *
-svn_wc__internal_get_ancestry(const char **url,
- svn_revnum_t *rev,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- const svn_wc_entry_t *ent;
-
- SVN_ERR(svn_wc__get_entry(&ent, db, local_abspath, FALSE,
- svn_node_unknown, FALSE,
- scratch_pool, scratch_pool));
-
- if (url)
- *url = apr_pstrdup(result_pool, ent->url);
-
- if (rev)
- *rev = ent->revision;
-
- return SVN_NO_ERROR;
-}
-
-
/* Helper for mark_tree_copied(), handling the property juggling and
state changes for a single item LOCAL_ABSPATH (of kind LOCAL_KIND). */
static svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=956908&r1=956907&r2=956908&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Jun 22 14:35:46 2010
@@ -38,6 +38,7 @@
#include "private/svn_wc_private.h"
#include "wc.h"
+#include "entries.h"
#include "lock.h"
#include "props.h"
#include "workqueue.h"
@@ -1053,14 +1054,22 @@ svn_wc_get_ancestry(char **url,
apr_pool_t *pool)
{
const char *local_abspath;
+ const svn_wc_entry_t *entry;
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
- return svn_error_return(svn_wc__internal_get_ancestry(
- (const char **)url, rev,
- svn_wc__adm_get_db(adm_access),
- local_abspath,
+ SVN_ERR(svn_wc__get_entry(&entry, svn_wc__adm_get_db(adm_access),
+ local_abspath, FALSE,
+ svn_node_unknown, FALSE,
pool, pool));
+
+ if (url)
+ *url = apr_pstrdup(pool, entry->url);
+
+ if (rev)
+ *rev = entry->revision;
+
+ return SVN_NO_ERROR;
}
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=956908&r1=956907&r2=956908&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Tue Jun 22 14:35:46 2010
@@ -528,15 +528,6 @@ svn_wc__internal_transmit_prop_deltas(sv
void *baton,
apr_pool_t *scratch_pool);
-/* Internal version of svn_wc_get_ancestry(). */
-svn_error_t *
-svn_wc__internal_get_ancestry(const char **url,
- svn_revnum_t *rev,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/* Library-internal version of svn_wc_ensure_adm4(). */
svn_error_t *
svn_wc__internal_ensure_adm(svn_wc__db_t *db,
