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/04/27 23:49:01 UTC
svn commit: r1097257 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/info.c libsvn_wc/info.c
Author: hwright
Date: Wed Apr 27 21:49:00 2011
New Revision: 1097257
URL: http://svn.apache.org/viewvc?rev=1097257&view=rev
Log:
Move the working-copy scraping part of svn_client_info3() to libsvn_wc.
This is pretty much just a straight code copy. We can adjust a number of
things after this move (using libsvn_wc-internal APIs and such), those will
eventually follow.
* subversion/include/private/svn_wc_private.h
(svn_wc__get_info): New.
* subversion/libsvn_wc/info.c:
New. Content largely copied from libsvn_client/info.c
* subversion/libsvn_client/info.c
(build_info_for_entry, build_info_for_unversioned, found_entry_baton,
info_found_node_callback, crawl_entries): Remove.
(svn_client_info3): Call the libsvn_wc function for wc info.
Added:
subversion/trunk/subversion/libsvn_wc/info.c
- copied, changed from r1097240, subversion/trunk/subversion/libsvn_client/info.c
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/info.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1097257&r1=1097256&r2=1097257&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed Apr 27 21:49:00 2011
@@ -37,6 +37,7 @@
#ifndef SVN_WC_PRIVATE_H
#define SVN_WC_PRIVATE_H
+#include "svn_types.h"
#include "svn_wc.h"
#ifdef __cplusplus
@@ -967,6 +968,20 @@ svn_wc__check_for_obstructions(svn_wc_no
svn_boolean_t no_wcroot_check,
apr_pool_t *scratch_pool);
+/* Walk the children of LOCAL_ABSPATH and push svn_info2_t's through
+ RECEIVER/RECEIVER_BATON. Honor DEPTH while crawling children, and
+ filter the pushed items against CHANGELISTS. */
+svn_error_t *
+svn_wc__get_info(svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ svn_depth_t depth,
+ svn_info_receiver2_t receiver,
+ void *receiver_baton,
+ const apr_array_header_t *changelists,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool);
+
#ifdef __cplusplus
}
Modified: subversion/trunk/subversion/libsvn_client/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=1097257&r1=1097256&r2=1097257&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Wed Apr 27 21:49:00 2011
@@ -71,214 +71,6 @@ build_info_from_dirent(svn_info2_t **inf
}
-/* Helper: build an svn_info_t *INFO struct from WC metadata,
- allocated in POOL. Pointer fields are copied by reference, not
- dup'd. PATH is the path of the WC node that ENTRY represents. */
-static svn_error_t *
-build_info_for_entry(svn_info2_t **info,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_info2_t *tmpinfo;
- svn_boolean_t is_copy_target;
- apr_time_t lock_date;
- svn_node_kind_t kind;
- svn_boolean_t exclude = FALSE;
- svn_boolean_t is_copy;
- svn_revnum_t rev;
- const char *repos_relpath;
-
- SVN_ERR(svn_wc_read_kind(&kind, wc_ctx, local_abspath, FALSE, scratch_pool));
-
- if (kind == svn_node_none)
- {
- svn_error_clear(svn_wc__node_depth_is_exclude(&exclude, wc_ctx,
- local_abspath,
- scratch_pool));
- if (! exclude)
- return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
- _("The node '%s' was not found."),
- svn_dirent_local_style(local_abspath,
- scratch_pool));
- }
-
- tmpinfo = apr_pcalloc(result_pool, sizeof(*tmpinfo));
- tmpinfo->kind = kind;
-
- /* ### This is dangerous, though temporary. Per the docstring, we shouldn't
- ### be alloc'ing this struct directly, but let libsvn_wc do it. Nowhere
- ### in libsvn_wc do we currently alloc this struct, so we do it here.
- ### All this code will shortly move to libsvn_wc, anyway. */
- tmpinfo->wc_info = apr_pcalloc(result_pool, sizeof(*tmpinfo->wc_info));
-
- SVN_ERR(svn_wc__node_get_origin(&is_copy, &rev, &repos_relpath,
- &tmpinfo->repos_root_URL,
- &tmpinfo->repos_UUID,
- wc_ctx, local_abspath, TRUE,
- result_pool, scratch_pool));
-
- /* 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));
- }
-
- if (repos_relpath)
- {
- SVN_ERR(svn_wc__node_get_changed_info(&tmpinfo->last_changed_rev,
- &tmpinfo->last_changed_date,
- &tmpinfo->last_changed_author,
- wc_ctx, local_abspath,
- result_pool, scratch_pool));
- }
- else
- tmpinfo->last_changed_rev = SVN_INVALID_REVNUM;
-
- if (is_copy)
- SVN_ERR(svn_wc__node_get_commit_base_rev(&tmpinfo->rev, wc_ctx,
- local_abspath, scratch_pool));
- else
- tmpinfo->rev = rev;
-
- /* ### FIXME: For now, we'll tweak an SVN_INVALID_REVNUM and make it
- ### 0. In WC-1, files scheduled for addition were assigned
- ### revision=0. This is wrong, and we're trying to remedy that,
- ### but for the sake of test suite and code sanity now in WC-NG,
- ### we'll just maintain the old behavior.
- ###
- ### We should also just be fetching the true BASE revision
- ### above, which means copied items would also not have a
- ### revision to display. But WC-1 wants to show the revision of
- ### copy targets as the copyfrom-rev. *sigh*
- */
- if (! SVN_IS_VALID_REVNUM(tmpinfo->rev))
- tmpinfo->rev = 0;
-
- tmpinfo->wc_info->copyfrom_rev = SVN_INVALID_REVNUM;
-
- if (is_copy)
- {
- SVN_ERR(svn_wc__node_get_copyfrom_info(NULL, NULL, NULL, NULL,
- &is_copy_target,
- wc_ctx, local_abspath,
- scratch_pool, scratch_pool));
-
- if (is_copy_target)
- {
- tmpinfo->wc_info->copyfrom_url = svn_path_url_add_component2(
- tmpinfo->repos_root_URL,
- repos_relpath, result_pool);
- tmpinfo->wc_info->copyfrom_rev = rev;
- }
- }
- else if (repos_relpath)
- tmpinfo->URL = svn_path_url_add_component2(tmpinfo->repos_root_URL,
- repos_relpath,
- result_pool);
-
- /* Don't create a URL for local additions */
- if (!tmpinfo->URL)
- SVN_ERR(svn_wc__node_get_url(&tmpinfo->URL, wc_ctx, local_abspath,
- result_pool, scratch_pool));
-
- if (tmpinfo->kind == svn_node_file)
- {
- const svn_checksum_t *checksum;
-
- SVN_ERR(svn_wc__node_get_changelist(&tmpinfo->wc_info->changelist, wc_ctx,
- local_abspath,
- result_pool, scratch_pool));
-
- SVN_ERR(svn_wc__node_get_checksum(&checksum, wc_ctx, local_abspath,
- scratch_pool, scratch_pool));
-
- tmpinfo->wc_info->checksum = svn_checksum_to_cstring(checksum,
- result_pool);
- }
-
- if (tmpinfo->kind == svn_node_dir)
- {
- SVN_ERR(svn_wc__node_get_depth(&tmpinfo->wc_info->depth, wc_ctx,
- local_abspath, scratch_pool));
-
- if (tmpinfo->wc_info->depth == svn_depth_unknown)
- tmpinfo->wc_info->depth = svn_depth_infinity;
- }
- else
- tmpinfo->wc_info->depth = svn_depth_infinity;
-
- if (exclude)
- tmpinfo->wc_info->depth = svn_depth_exclude;
-
- SVN_ERR(svn_wc__node_get_schedule(&tmpinfo->wc_info->schedule, NULL,
- wc_ctx, local_abspath, scratch_pool));
-
- SVN_ERR(svn_wc_get_wc_root(&tmpinfo->wc_info->wcroot_abspath, wc_ctx,
- local_abspath, result_pool, scratch_pool));
-
- SVN_ERR(svn_wc__node_get_recorded_info(&tmpinfo->wc_info->working_size,
- &tmpinfo->wc_info->text_time,
- wc_ctx, local_abspath, scratch_pool));
-
- /* lock stuff */
- if (kind == svn_node_file)
- {
- const char *lock_token;
- const char *lock_owner;
- const char *lock_comment;
-
- SVN_ERR(svn_wc__node_get_lock_info(&lock_token, &lock_owner,
- &lock_comment, &lock_date,
- wc_ctx, local_abspath,
- result_pool, scratch_pool));
-
- if (lock_token) /* the token is the critical bit. */
- {
- tmpinfo->lock = apr_pcalloc(result_pool, sizeof(*(tmpinfo->lock)));
- tmpinfo->lock->token = lock_token;
- tmpinfo->lock->owner = lock_owner;
- tmpinfo->lock->comment = lock_comment;
- tmpinfo->lock->creation_date = lock_date;
- }
- }
-
- *info = tmpinfo;
- return SVN_NO_ERROR;
-}
-
-
-/* Helper: build an svn_info_t *INFO struct with minimal content, to be
- used in reporting info for unversioned tree conflict victims. */
-/* ### Some fields we could fill out based on the parent dir's entry
- or by looking at an obstructing item. */
-static svn_error_t *
-build_info_for_unversioned(svn_info2_t **info,
- apr_pool_t *pool)
-{
- svn_info2_t *tmpinfo = apr_pcalloc(pool, sizeof(*tmpinfo));
- tmpinfo->wc_info = apr_pcalloc(pool, sizeof (*tmpinfo->wc_info));
-
- tmpinfo->URL = NULL;
- tmpinfo->rev = SVN_INVALID_REVNUM;
- tmpinfo->kind = svn_node_none;
- tmpinfo->repos_UUID = NULL;
- tmpinfo->repos_root_URL = NULL;
- tmpinfo->last_changed_rev = SVN_INVALID_REVNUM;
- tmpinfo->last_changed_date = 0;
- tmpinfo->last_changed_author = NULL;
- tmpinfo->lock = NULL;
- tmpinfo->size = SVN_INFO_SIZE_UNKNOWN;
-
- *info = tmpinfo;
- return SVN_NO_ERROR;
-}
-
-
/* The dirent fields we care about for our calls to svn_ra_get_dir2. */
#define DIRENT_FIELDS (SVN_DIRENT_KIND | \
SVN_DIRENT_CREATED_REV | \
@@ -361,129 +153,6 @@ push_dir_info(svn_ra_session_t *ra_sessi
}
-
-/* Callback and baton for crawl_entries() walk over entries files. */
-struct found_entry_baton
-{
- svn_info_receiver2_t receiver;
- void *receiver_baton;
- svn_wc_context_t *wc_ctx;
-};
-
-/* An svn_wc__node_found_func_t callback function. */
-static svn_error_t *
-info_found_node_callback(const char *local_abspath,
- svn_node_kind_t kind,
- void *walk_baton,
- apr_pool_t *pool)
-{
- struct found_entry_baton *fe_baton = walk_baton;
- svn_info2_t *info = NULL;
- const svn_wc_conflict_description2_t *tree_conflict = NULL;
- svn_error_t *err;
-
- SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, fe_baton->wc_ctx,
- local_abspath, pool, pool));
-
- err = build_info_for_entry(&info, fe_baton->wc_ctx, local_abspath,
- pool, pool);
- if (err && (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
- && tree_conflict)
- {
- svn_error_clear(err);
-
- SVN_ERR(build_info_for_unversioned(&info, pool));
- SVN_ERR(svn_wc__node_get_repos_info(&(info->repos_root_URL),
- NULL,
- fe_baton->wc_ctx,
- local_abspath, FALSE, FALSE,
- pool, pool));
- }
- else if (err)
- return svn_error_return(err);
-
- SVN_ERR_ASSERT(info != NULL);
-
- if (tree_conflict)
- {
- info->wc_info->conflicts = apr_array_make(pool, 1,
- sizeof(const svn_wc_conflict_description2_t *));
-
- APR_ARRAY_PUSH(info->wc_info->conflicts,
- const svn_wc_conflict_description2_t *) = tree_conflict;
- }
-
- SVN_ERR(fe_baton->receiver(fe_baton->receiver_baton, local_abspath,
- info, pool));
- return SVN_NO_ERROR;
-}
-
-
-/* Walk the children of LOCAL_ABSPATH to push svn_info_t's through
- RECEIVER/RECEIVER_BATON. Honor DEPTH while crawling children, and
- filter the pushed items against CHANGELIST_HASH. */
-static svn_error_t *
-crawl_entries(const char *local_abspath,
- svn_info_receiver2_t receiver,
- void *receiver_baton,
- svn_depth_t depth,
- const apr_array_header_t *changelists,
- svn_client_ctx_t *ctx,
- apr_pool_t *pool)
-{
- struct found_entry_baton fe_baton;
- svn_error_t *err;
-
- fe_baton.receiver = receiver;
- fe_baton.receiver_baton = receiver_baton;
- fe_baton.wc_ctx = ctx->wc_ctx;
-
- err = svn_wc__node_walk_children(ctx->wc_ctx, local_abspath, FALSE,
- changelists,
- info_found_node_callback, &fe_baton, depth,
- ctx->cancel_func, ctx->cancel_baton, pool);
-
- if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
- {
- /* Check for a tree conflict on the root node of the info, and if there
- is one, send a minimal info struct. */
- const svn_wc_conflict_description2_t *tree_conflict;
-
- SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx,
- local_abspath, pool, pool));
-
- if (tree_conflict)
- {
- svn_info2_t *info;
- svn_error_clear(err);
-
- SVN_ERR(build_info_for_unversioned(&info, pool));
- if (tree_conflict)
- {
- info->wc_info->conflicts = apr_array_make(pool, 1,
- sizeof(const svn_wc_conflict_description2_t *));
-
- APR_ARRAY_PUSH(info->wc_info->conflicts,
- const svn_wc_conflict_description2_t *) = tree_conflict;
- }
-
- SVN_ERR(svn_wc__node_get_repos_info(&(info->repos_root_URL),
- NULL,
- ctx->wc_ctx,
- local_abspath, FALSE, FALSE,
- pool, pool));
-
- SVN_ERR(receiver(receiver_baton, local_abspath, info, pool));
- }
- else
- return svn_error_return(err);
- }
- else if (err)
- return svn_error_return(err);
-
- return SVN_NO_ERROR;
-}
-
/* Set *SAME_P to TRUE if URL exists in the head of the repository and
refers to the same resource as it does in REV, using POOL for
temporary allocations. RA_SESSION is an open RA session for URL. */
@@ -563,8 +232,9 @@ svn_client_info3(const char *abspath_or_
{
/* Do all digging in the working copy. */
return svn_error_return(
- crawl_entries(abspath_or_url, receiver, receiver_baton,
- depth, changelists, ctx, pool));
+ svn_wc__get_info(ctx->wc_ctx, abspath_or_url, depth,
+ receiver, receiver_baton, changelists,
+ ctx->cancel_func, ctx->cancel_baton, pool));
}
/* Go repository digging instead. */
Copied: subversion/trunk/subversion/libsvn_wc/info.c (from r1097240, subversion/trunk/subversion/libsvn_client/info.c)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?p2=subversion/trunk/subversion/libsvn_wc/info.c&p1=subversion/trunk/subversion/libsvn_client/info.c&r1=1097240&r2=1097257&rev=1097257&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Wed Apr 27 21:49:00 2011
@@ -1,6 +1,5 @@
-/*
- * info.c: return system-generated metadata about paths or URLs.
- *
+/**
+ * @copyright
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,58 +18,18 @@
* specific language governing permissions and limitations
* under the License.
* ====================================================================
+ * @endcopyright
*/
-/* ==================================================================== */
-
-
-
-#include "client.h"
-#include "svn_client.h"
-#include "svn_pools.h"
#include "svn_dirent_uri.h"
#include "svn_path.h"
-#include "svn_hash.h"
#include "svn_wc.h"
#include "svn_private_config.h"
-#include "private/svn_fspath.h"
#include "private/svn_wc_private.h"
-/* Helper: build an svn_info_t *INFO struct from svn_dirent_t DIRENT
- and (possibly NULL) svn_lock_t LOCK, all allocated in POOL.
- Pointer fields are copied by reference, not dup'd. */
-static svn_error_t *
-build_info_from_dirent(svn_info2_t **info,
- const svn_dirent_t *dirent,
- svn_lock_t *lock,
- const char *URL,
- svn_revnum_t revision,
- const char *repos_UUID,
- const char *repos_root,
- apr_pool_t *pool)
-{
- svn_info2_t *tmpinfo = apr_pcalloc(pool, sizeof(*tmpinfo));
-
- tmpinfo->URL = URL;
- tmpinfo->rev = revision;
- tmpinfo->kind = dirent->kind;
- tmpinfo->repos_UUID = repos_UUID;
- tmpinfo->repos_root_URL = repos_root;
- tmpinfo->last_changed_rev = dirent->created_rev;
- tmpinfo->last_changed_date = dirent->time;
- tmpinfo->last_changed_author = dirent->last_author;
- tmpinfo->lock = lock;
- tmpinfo->size = dirent->size;
-
- tmpinfo->wc_info = NULL;
-
- *info = tmpinfo;
- return SVN_NO_ERROR;
-}
-
-
+
/* Helper: build an svn_info_t *INFO struct from WC metadata,
allocated in POOL. Pointer fields are copied by reference, not
dup'd. PATH is the path of the WC node that ENTRY represents. */
@@ -278,90 +237,6 @@ build_info_for_unversioned(svn_info2_t *
return SVN_NO_ERROR;
}
-
-/* The dirent fields we care about for our calls to svn_ra_get_dir2. */
-#define DIRENT_FIELDS (SVN_DIRENT_KIND | \
- SVN_DIRENT_CREATED_REV | \
- SVN_DIRENT_TIME | \
- SVN_DIRENT_LAST_AUTHOR)
-
-
-/* Helper func for recursively fetching svn_dirent_t's from a remote
- directory and pushing them at an info-receiver callback.
-
- DEPTH is the depth starting at DIR, even though RECEIVER is never
- invoked on DIR: if DEPTH is svn_depth_immediates, then invoke
- RECEIVER on all children of DIR, but none of their children; if
- svn_depth_files, then invoke RECEIVER on file children of DIR but
- not on subdirectories; if svn_depth_infinity, recurse fully.
- DIR is a relpath, relative to the root of RA_SESSION.
-*/
-static svn_error_t *
-push_dir_info(svn_ra_session_t *ra_session,
- const char *session_URL,
- const char *dir,
- svn_revnum_t rev,
- const char *repos_UUID,
- const char *repos_root,
- svn_info_receiver2_t receiver,
- void *receiver_baton,
- svn_depth_t depth,
- svn_client_ctx_t *ctx,
- apr_hash_t *locks,
- apr_pool_t *pool)
-{
- apr_hash_t *tmpdirents;
- apr_hash_index_t *hi;
- apr_pool_t *subpool = svn_pool_create(pool);
-
- SVN_ERR(svn_ra_get_dir2(ra_session, &tmpdirents, NULL, NULL,
- dir, rev, DIRENT_FIELDS, pool));
-
- for (hi = apr_hash_first(pool, tmpdirents); hi; hi = apr_hash_next(hi))
- {
- const char *path, *URL, *fs_path;
- svn_lock_t *lock;
- svn_info2_t *info;
- const char *name = svn__apr_hash_index_key(hi);
- svn_dirent_t *the_ent = svn__apr_hash_index_val(hi);
-
- svn_pool_clear(subpool);
-
- if (ctx->cancel_func)
- SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
-
- path = svn_relpath_join(dir, name, subpool);
- URL = svn_path_url_add_component2(session_URL, name, subpool);
- fs_path = svn_fspath__canonicalize(svn_uri_is_child(repos_root, URL,
- subpool), subpool);
-
- lock = apr_hash_get(locks, fs_path, APR_HASH_KEY_STRING);
-
- SVN_ERR(build_info_from_dirent(&info, the_ent, lock, URL, rev,
- repos_UUID, repos_root, subpool));
-
- if (depth >= svn_depth_immediates
- || (depth == svn_depth_files && the_ent->kind == svn_node_file))
- {
- SVN_ERR(receiver(receiver_baton, path, info, subpool));
- }
-
- if (depth == svn_depth_infinity && the_ent->kind == svn_node_dir)
- {
- SVN_ERR(push_dir_info(ra_session, URL, path,
- rev, repos_UUID, repos_root,
- receiver, receiver_baton,
- depth, ctx, locks, subpool));
- }
- }
-
- svn_pool_destroy(subpool);
-
- return SVN_NO_ERROR;
-}
-
-
-
/* Callback and baton for crawl_entries() walk over entries files. */
struct found_entry_baton
{
@@ -419,29 +294,28 @@ info_found_node_callback(const char *loc
}
-/* Walk the children of LOCAL_ABSPATH to push svn_info_t's through
- RECEIVER/RECEIVER_BATON. Honor DEPTH while crawling children, and
- filter the pushed items against CHANGELIST_HASH. */
-static svn_error_t *
-crawl_entries(const char *local_abspath,
- svn_info_receiver2_t receiver,
- void *receiver_baton,
- svn_depth_t depth,
- const apr_array_header_t *changelists,
- svn_client_ctx_t *ctx,
- apr_pool_t *pool)
+svn_error_t *
+svn_wc__get_info(svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ svn_depth_t depth,
+ svn_info_receiver2_t receiver,
+ void *receiver_baton,
+ const apr_array_header_t *changelists,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool)
{
struct found_entry_baton fe_baton;
svn_error_t *err;
fe_baton.receiver = receiver;
fe_baton.receiver_baton = receiver_baton;
- fe_baton.wc_ctx = ctx->wc_ctx;
+ fe_baton.wc_ctx = wc_ctx;
- err = svn_wc__node_walk_children(ctx->wc_ctx, local_abspath, FALSE,
+ err = svn_wc__node_walk_children(wc_ctx, local_abspath, FALSE,
changelists,
info_found_node_callback, &fe_baton, depth,
- ctx->cancel_func, ctx->cancel_baton, pool);
+ cancel_func, cancel_baton, scratch_pool);
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
{
@@ -449,18 +323,19 @@ crawl_entries(const char *local_abspath,
is one, send a minimal info struct. */
const svn_wc_conflict_description2_t *tree_conflict;
- SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx,
- local_abspath, pool, pool));
+ SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, wc_ctx,
+ local_abspath, scratch_pool,
+ scratch_pool));
if (tree_conflict)
{
svn_info2_t *info;
svn_error_clear(err);
- SVN_ERR(build_info_for_unversioned(&info, pool));
+ SVN_ERR(build_info_for_unversioned(&info, scratch_pool));
if (tree_conflict)
{
- info->wc_info->conflicts = apr_array_make(pool, 1,
+ info->wc_info->conflicts = apr_array_make(scratch_pool, 1,
sizeof(const svn_wc_conflict_description2_t *));
APR_ARRAY_PUSH(info->wc_info->conflicts,
@@ -468,12 +343,11 @@ crawl_entries(const char *local_abspath,
}
SVN_ERR(svn_wc__node_get_repos_info(&(info->repos_root_URL),
- NULL,
- ctx->wc_ctx,
+ NULL, wc_ctx,
local_abspath, FALSE, FALSE,
- pool, pool));
+ scratch_pool, scratch_pool));
- SVN_ERR(receiver(receiver_baton, local_abspath, info, pool));
+ SVN_ERR(receiver(receiver_baton, local_abspath, info, scratch_pool));
}
else
return svn_error_return(err);
@@ -483,264 +357,3 @@ crawl_entries(const char *local_abspath,
return SVN_NO_ERROR;
}
-
-/* Set *SAME_P to TRUE if URL exists in the head of the repository and
- refers to the same resource as it does in REV, using POOL for
- temporary allocations. RA_SESSION is an open RA session for URL. */
-static svn_error_t *
-same_resource_in_head(svn_boolean_t *same_p,
- const char *url,
- svn_revnum_t rev,
- svn_ra_session_t *ra_session,
- svn_client_ctx_t *ctx,
- apr_pool_t *pool)
-{
- svn_error_t *err;
- svn_opt_revision_t start_rev, end_rev, peg_rev;
- svn_opt_revision_t *ignored_rev;
- const char *head_url, *ignored_url;
-
- start_rev.kind = svn_opt_revision_head;
- peg_rev.kind = svn_opt_revision_number;
- peg_rev.value.number = rev;
- end_rev.kind = svn_opt_revision_unspecified;
-
- err = svn_client__repos_locations(&head_url, &ignored_rev,
- &ignored_url, &ignored_rev,
- ra_session,
- url, &peg_rev,
- &start_rev, &end_rev,
- ctx, pool);
- if (err &&
- ((err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES) ||
- (err->apr_err == SVN_ERR_FS_NOT_FOUND)))
- {
- svn_error_clear(err);
- *same_p = FALSE;
- return SVN_NO_ERROR;
- }
- else
- SVN_ERR(err);
-
- /* ### Currently, the URLs should always be equal, since we can't
- ### walk forwards in history. */
- *same_p = (strcmp(url, head_url) == 0);
-
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_client_info3(const char *abspath_or_url,
- const svn_opt_revision_t *peg_revision,
- const svn_opt_revision_t *revision,
- svn_info_receiver2_t receiver,
- void *receiver_baton,
- svn_depth_t depth,
- const apr_array_header_t *changelists,
- svn_client_ctx_t *ctx,
- apr_pool_t *pool)
-{
- svn_ra_session_t *ra_session, *parent_ra_session;
- svn_revnum_t rev;
- const char *url;
- svn_node_kind_t url_kind;
- const char *repos_root_URL, *repos_UUID;
- svn_lock_t *lock;
- svn_boolean_t related;
- apr_hash_t *parent_ents;
- const char *parent_url, *base_name;
- svn_dirent_t *the_ent;
- svn_info2_t *info;
- svn_error_t *err;
-
- if (depth == svn_depth_unknown)
- depth = svn_depth_empty;
-
- if ((revision == NULL
- || revision->kind == svn_opt_revision_unspecified)
- && (peg_revision == NULL
- || peg_revision->kind == svn_opt_revision_unspecified))
- {
- /* Do all digging in the working copy. */
- return svn_error_return(
- crawl_entries(abspath_or_url, receiver, receiver_baton,
- depth, changelists, ctx, pool));
- }
-
- /* Go repository digging instead. */
-
- /* Trace rename history (starting at path_or_url@peg_revision) and
- return RA session to the possibly-renamed URL as it exists in REVISION.
- The ra_session returned will be anchored on this "final" URL. */
- SVN_ERR(svn_client__ra_session_from_path(&ra_session, &rev,
- &url, abspath_or_url, NULL,
- peg_revision,
- revision, ctx, pool));
-
- SVN_ERR(svn_ra_get_repos_root2(ra_session, &repos_root_URL, pool));
- SVN_ERR(svn_ra_get_uuid2(ra_session, &repos_UUID, pool));
-
- svn_uri_split(&parent_url, &base_name, url, pool);
-
- /* Get the dirent for the URL itself. */
- err = svn_ra_stat(ra_session, "", rev, &the_ent, pool);
-
- /* svn_ra_stat() will work against old versions of mod_dav_svn, but
- not old versions of svnserve. In the case of a pre-1.2 svnserve,
- catch the specific error it throws:*/
- if (err && err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED)
- {
- /* Fall back to pre-1.2 strategy for fetching dirent's URL. */
- svn_error_clear(err);
-
- if (strcmp(url, repos_root_URL) == 0)
- {
- /* In this universe, there's simply no way to fetch
- information about the repository's root directory!
- If we're recursing, degrade gracefully: rather than
- throw an error, return no information about the
- repos root. */
- if (depth > svn_depth_empty)
- goto pre_1_2_recurse;
-
- /* Otherwise, we really are stuck. Better tell the user
- what's going on. */
- return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("Server does not support retrieving "
- "information about the repository root"));
- }
-
- SVN_ERR(svn_ra_check_path(ra_session, "", rev, &url_kind, pool));
- if (url_kind == svn_node_none)
- return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
- _("URL '%s' non-existent in revision %ld"),
- url, rev);
-
- /* Open a new RA session to the item's parent. */
- SVN_ERR(svn_client__open_ra_session_internal(&parent_ra_session, NULL,
- parent_url, NULL,
- NULL, FALSE, TRUE,
- ctx, pool));
-
- /* Get all parent's entries, and find the item's dirent in the hash. */
- SVN_ERR(svn_ra_get_dir2(parent_ra_session, &parent_ents, NULL, NULL,
- "", rev, DIRENT_FIELDS, pool));
- the_ent = apr_hash_get(parent_ents, base_name, APR_HASH_KEY_STRING);
- if (the_ent == NULL)
- return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
- _("URL '%s' non-existent in revision %ld"),
- url, rev);
- }
- else if (err)
- {
- return svn_error_return(err);
- }
-
- if (! the_ent)
- return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
- _("URL '%s' non-existent in revision %ld"),
- url, rev);
-
- /* Check if the URL exists in HEAD and refers to the same resource.
- In this case, we check the repository for a lock on this URL.
-
- ### There is a possible race here, since HEAD might have changed since
- ### we checked it. A solution to this problem could be to do the below
- ### check in a loop which only terminates if the HEAD revision is the same
- ### before and after this check. That could, however, lead to a
- ### starvation situation instead. */
- SVN_ERR(same_resource_in_head(&related, url, rev, ra_session, ctx, pool));
- if (related)
- {
- err = svn_ra_get_lock(ra_session, &lock, "", pool);
-
- /* An old mod_dav_svn will always work; there's nothing wrong with
- doing a PROPFIND for a property named "DAV:supportedlock". But
- an old svnserve will error. */
- if (err && err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED)
- {
- svn_error_clear(err);
- lock = NULL;
- }
- else if (err)
- return svn_error_return(err);
- }
- else
- lock = NULL;
-
- /* Push the URL's dirent (and lock) at the callback.*/
- SVN_ERR(build_info_from_dirent(&info, the_ent, lock, url, rev,
- repos_UUID, repos_root_URL, pool));
- SVN_ERR(receiver(receiver_baton, base_name, info, pool));
-
- /* Possibly recurse, using the original RA session. */
- if (depth > svn_depth_empty && (the_ent->kind == svn_node_dir))
- {
- apr_hash_t *locks;
-
-pre_1_2_recurse:
- if (peg_revision->kind == svn_opt_revision_head)
- {
- err = svn_ra_get_locks2(ra_session, &locks, "", depth,
- pool);
-
- /* Catch specific errors thrown by old mod_dav_svn or svnserve. */
- if (err &&
- (err->apr_err == SVN_ERR_RA_NOT_IMPLEMENTED
- || err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE))
- {
- svn_error_clear(err);
- locks = apr_hash_make(pool); /* use an empty hash */
- }
- else if (err)
- return svn_error_return(err);
- }
- else
- locks = apr_hash_make(pool); /* use an empty hash */
-
- SVN_ERR(push_dir_info(ra_session, url, "", rev,
- repos_UUID, repos_root_URL,
- receiver, receiver_baton,
- depth, ctx, locks, pool));
- }
-
- return SVN_NO_ERROR;
-}
-
-svn_info_t *
-svn_info_dup(const svn_info_t *info, apr_pool_t *pool)
-{
- svn_info_t *dupinfo = apr_palloc(pool, sizeof(*dupinfo));
-
- /* Perform a trivial copy ... */
- *dupinfo = *info;
-
- /* ...and then re-copy stuff that needs to be duped into our pool. */
- if (info->URL)
- dupinfo->URL = apr_pstrdup(pool, info->URL);
- if (info->repos_root_URL)
- dupinfo->repos_root_URL = apr_pstrdup(pool, info->repos_root_URL);
- if (info->repos_UUID)
- dupinfo->repos_UUID = apr_pstrdup(pool, info->repos_UUID);
- if (info->last_changed_author)
- dupinfo->last_changed_author = apr_pstrdup(pool,
- info->last_changed_author);
- if (info->lock)
- dupinfo->lock = svn_lock_dup(info->lock, pool);
- if (info->copyfrom_url)
- dupinfo->copyfrom_url = apr_pstrdup(pool, info->copyfrom_url);
- if (info->checksum)
- dupinfo->checksum = apr_pstrdup(pool, info->checksum);
- if (info->conflict_old)
- dupinfo->conflict_old = apr_pstrdup(pool, info->conflict_old);
- if (info->conflict_new)
- dupinfo->conflict_new = apr_pstrdup(pool, info->conflict_new);
- if (info->conflict_wrk)
- dupinfo->conflict_wrk = apr_pstrdup(pool, info->conflict_wrk);
- if (info->prejfile)
- dupinfo->prejfile = apr_pstrdup(pool, info->prejfile);
- if (info->wcroot_abspath)
- dupinfo->wcroot_abspath = apr_pstrdup(pool, info->wcroot_abspath);
-
- return dupinfo;
-}
Re: svn commit: r1097257 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/info.c libsvn_wc/info.c
Posted by Julian Foad <ju...@wandisco.com>.
On Wed, 2011-04-27 at 19:13 -0400, Greg Stein wrote:
> On Wed, Apr 27, 2011 at 17:49, <hw...@apache.org> wrote:
> > Author: hwright
> > Date: Wed Apr 27 21:49:00 2011
> > New Revision: 1097257
> >
> > URL: http://svn.apache.org/viewvc?rev=1097257&view=rev
> > Log:
> > Move the working-copy scraping part of svn_client_info3() to libsvn_wc.
> >
> > This is pretty much just a straight code copy. We can adjust a number of
> > things after this move (using libsvn_wc-internal APIs and such), those will
> > eventually follow.
> >
> > * subversion/include/private/svn_wc_private.h
> > (svn_wc__get_info): New.
>
> I know the contents of this function were simply copied from existing
> code, but there is a potential error leak in there. The line:
>
> SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx,
>
> If that returns with an error, then 'err' will leak. The above line
> should use an err2 variable, with appropriate management of the two
> errors...
>
> (separately, there is a lot of simplification of the various 'return'
> exits at the bottom of the function)
I observe that almost the whole body of svn_wc__get_info() is a
duplicate of the callback function above it, info_found_node_callback().
For a start, we can replace the body by a call to that. (I'm testing
that now.)
As a follow-up, it looks like the code here is a work-around for
svn_wc__node_walk_children() not providing the behaviour that we want
from it. This appears to indicate that svn_wc__node_walk_children()
doesn't call the callback function if the target node is non-present and
has a tree conflict, whereas it does call the callback function for any
child node it encounters that is non-present and has a tree conflict.
We should at least document what it does exactly, and at best improve it
and test it.
- Julian
Re: svn commit: r1097257 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/info.c libsvn_wc/info.c
Posted by Greg Stein <gs...@gmail.com>.
On Wed, Apr 27, 2011 at 17:49, <hw...@apache.org> wrote:
> Author: hwright
> Date: Wed Apr 27 21:49:00 2011
> New Revision: 1097257
>
> URL: http://svn.apache.org/viewvc?rev=1097257&view=rev
> Log:
> Move the working-copy scraping part of svn_client_info3() to libsvn_wc.
>
> This is pretty much just a straight code copy. We can adjust a number of
> things after this move (using libsvn_wc-internal APIs and such), those will
> eventually follow.
>
> * subversion/include/private/svn_wc_private.h
> (svn_wc__get_info): New.
I know the contents of this function were simply copied from existing
code, but there is a potential error leak in there. The line:
SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx,
If that returns with an error, then 'err' will leak. The above line
should use an err2 variable, with appropriate management of the two
errors...
(separately, there is a lot of simplification of the various 'return'
exits at the bottom of the function)
>...
Cheers,
-g