[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: rev 278 - trunk/subversion/include trunk/subversion/libsvn_ra_local trunk/subversion/libsvn_client trunk/subversion/libsvn_ra_dav

From: <kfogel_at_collab.net>
Date: 2001-10-22 17:56:54 CEST

kevin@tigris.org writes:
> Log:
> Make nonrecursive checkouts work. (I know this was low priority, but it was
> easy once I got nonrecursive updates working).

Not just a "low priority" -- I thought we'd decided not to do it,
because we don't know how to handle a nonrecursive (shallow) working
copy.

How does the working copy behave after one of these checkouts, when
you run update?

-K

> * include/svn_ra.h:do_checkout - Add recurse argument.
>
> * libsvn_ra_local/ra_plugin.c:do_checkout - Add recurse argument, pass to
> svn_ra_local__checkout
>
> * libsvn_ra_local/ra_local.h:svn_ra_local__checkout - Add recurse arg.
>
> * libsvn_ra_local/checkout.c:walk_tree - take recurse arg. Only recurse
> if it is true.
>
> * libsvn_ra_local/checkout.c:svn_ra_local__checkout - Take new recurse arg,
> pass to walk_tree.
>
> * libsvn_client/checkout.c:svn_client_checkout - Pass recurse arg to
> ra_lib->do_checkout.
>
> * libsvn_ra_dav/ra_dav.h:svn_ra_dav__do_checkout - Take new recurse arg.
>
> * libsvn_ra_dav/fetch.c:svn_ra_dav__do_checkout - Take new recurse arg,
> use it instead of always using a variable equal to 1.
>
>
>
> Modified: trunk/subversion/include/svn_ra.h
> ==============================================================================
> --- OLD/trunk/subversion/include/svn_ra.h Mon Oct 22 09:55:32 2001
> +++ NEW/trunk/subversion/include/svn_ra.h Mon Oct 22 09:55:33 2001
> @@ -290,6 +290,7 @@
> working copy. */
> svn_error_t *(*do_checkout) (void *session_baton,
> svn_revnum_t revision,
> + svn_boolean_t recurse,
> const svn_delta_edit_fns_t *editor,
> void *edit_baton);
>
>
> Modified: trunk/subversion/libsvn_ra_local/ra_plugin.c
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_ra_local/ra_plugin.c Mon Oct 22 09:55:33 2001
> +++ NEW/trunk/subversion/libsvn_ra_local/ra_plugin.c Mon Oct 22 09:55:33 2001
> @@ -259,6 +259,7 @@
> static svn_error_t *
> do_checkout (void *session_baton,
> svn_revnum_t revision,
> + svn_boolean_t recurse,
> const svn_delta_edit_fns_t *editor,
> void *edit_baton)
> {
> @@ -273,6 +274,7 @@
>
> SVN_ERR (svn_ra_local__checkout (sbaton->fs,
> revnum_to_fetch,
> + recurse,
> sbaton->repository_URL,
> sbaton->fs_path,
> editor, edit_baton, sbaton->pool));
>
> Modified: trunk/subversion/libsvn_ra_local/ra_local.h
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_ra_local/ra_local.h Mon Oct 22 09:55:33 2001
> +++ NEW/trunk/subversion/libsvn_ra_local/ra_local.h Mon Oct 22 09:55:33 2001
> @@ -111,6 +111,7 @@
> svn_error_t *
> svn_ra_local__checkout (svn_fs_t *fs,
> svn_revnum_t revnum,
> + svn_boolean_t recurse,
> svn_stringbuf_t *URL,
> svn_stringbuf_t *fs_path,
> const svn_delta_edit_fns_t *editor,
>
> Modified: trunk/subversion/libsvn_ra_local/checkout.c
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_ra_local/checkout.c Mon Oct 22 09:55:33 2001
> +++ NEW/trunk/subversion/libsvn_ra_local/checkout.c Mon Oct 22 09:55:33 2001
> @@ -128,6 +128,7 @@
> const svn_delta_edit_fns_t *editor,
> void *edit_baton,
> svn_stringbuf_t *URL,
> + svn_boolean_t recurse,
> apr_pool_t *pool)
> {
> apr_hash_t *dirents;
> @@ -159,7 +160,7 @@
> SVN_ERR (svn_fs_is_dir (&is_dir, root, dirent_path->data, iter_pool));
> SVN_ERR (svn_fs_is_file (&is_file, root, dirent_path->data, iter_pool));
>
> - if (is_dir)
> + if (is_dir && recurse)
> {
> void *new_dir_baton;
>
> @@ -174,8 +175,8 @@
> SVN_ERR (set_any_props (root, dirent_path, new_dir_baton,
> editor, 1, iter_pool));
> /* Recurse */
> - SVN_ERR (walk_tree (root, dirent_path, new_dir_baton,
> - editor, edit_baton, URL_path, iter_pool));
> + SVN_ERR (walk_tree (root, dirent_path, new_dir_baton, editor,
> + edit_baton, URL_path, recurse, iter_pool));
> }
>
> else if (is_file)
> @@ -218,6 +219,7 @@
> svn_error_t *
> svn_ra_local__checkout (svn_fs_t *fs,
> svn_revnum_t revnum,
> + svn_boolean_t recurse,
> svn_stringbuf_t *URL,
> svn_stringbuf_t *fs_path,
> const svn_delta_edit_fns_t *editor,
> @@ -234,7 +236,7 @@
> &root_dir_baton));
>
> SVN_ERR (walk_tree (root, fs_path, root_dir_baton,
> - editor, edit_baton, URL, pool));
> + editor, edit_baton, URL, recurse, pool));
>
> SVN_ERR (editor->close_edit (edit_baton));
>
>
> Modified: trunk/subversion/libsvn_client/checkout.c
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_client/checkout.c Mon Oct 22 09:55:33 2001
> +++ NEW/trunk/subversion/libsvn_client/checkout.c Mon Oct 22 09:55:33 2001
> @@ -113,6 +113,7 @@
> revnum, that means RA will fetch the latest revision. */
> SVN_ERR (ra_lib->do_checkout (session,
> revision,
> + recurse,
> checkout_editor,
> checkout_edit_baton));
>
>
> Modified: trunk/subversion/libsvn_ra_dav/ra_dav.h
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_ra_dav/ra_dav.h Mon Oct 22 09:55:33 2001
> +++ NEW/trunk/subversion/libsvn_ra_dav/ra_dav.h Mon Oct 22 09:55:33 2001
> @@ -85,6 +85,7 @@
> svn_error_t * svn_ra_dav__do_checkout (
> void *session_baton,
> svn_revnum_t revision,
> + svn_boolean_t recurse,
> const svn_delta_edit_fns_t *editor,
> void *edit_baton);
>
>
> Modified: trunk/subversion/libsvn_ra_dav/fetch.c
> ==============================================================================
> --- OLD/trunk/subversion/libsvn_ra_dav/fetch.c Mon Oct 22 09:55:33 2001
> +++ NEW/trunk/subversion/libsvn_ra_dav/fetch.c Mon Oct 22 09:55:33 2001
> @@ -543,11 +543,11 @@
>
> svn_error_t * svn_ra_dav__do_checkout(void *session_baton,
> svn_revnum_t revision,
> + svn_boolean_t recurse,
> const svn_delta_edit_fns_t *editor,
> void *edit_baton)
> {
> svn_ra_session_t *ras = session_baton;
> - int recurse = 1; /* ### until it gets passed to us */
>
> svn_error_t *err;
> void *root_baton;
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:45 2006

This is an archived mail posted to the Subversion Dev mailing list.