You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2010/11/12 16:47:50 UTC
svn commit: r1034435 - /subversion/trunk/subversion/libsvn_client/client.h
Author: cmpilato
Date: Fri Nov 12 15:47:50 2010
New Revision: 1034435
URL: http://svn.apache.org/viewvc?rev=1034435&view=rev
Log:
* subversion/libsvn_client/client.h
Shuffle some prototypes around to get all the externals-related
stuff into one region of this file. While here, tweak some
docstrings.
Modified:
subversion/trunk/subversion/libsvn_client/client.h
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1034435&r1=1034434&r2=1034435&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Fri Nov 12 15:47:50 2010
@@ -39,26 +39,6 @@
extern "C" {
#endif /* __cplusplus */
-struct svn_cl__externals_store
-{
- apr_pool_t *pool;
- apr_hash_t *externals_old;
- apr_hash_t *externals_new;
- apr_hash_t *depths;
-};
-
-/* svn_wc_external_update_t handler, storing the received data in a
- * svn_cl__externals_store instance, which must be passed as baton.
- * When one of the hashes is NULL, these values are not stored */
-svn_error_t *
-svn_cl__store_externals(void *baton,
- const char *local_abspath,
- const svn_string_t *old_value,
- const svn_string_t *new_value,
- svn_depth_t depth,
- apr_pool_t *scratch_pool);
-
-
/* Set *URL, allocated in RESULT_POOL, and *PEG_REVNUM (the latter is
ignored if NULL) to the repository URL of ABSPATH_OR_URL. If
@@ -918,8 +898,28 @@ svn_client__do_commit(const char *base_u
/*** Externals (Modules) ***/
-/* Handle changes to the svn:externals property described by EXTERNALS_OLD,
+struct svn_cl__externals_store
+{
+ apr_pool_t *pool;
+ apr_hash_t *externals_old;
+ apr_hash_t *externals_new;
+ apr_hash_t *depths;
+};
+
+/* Implements svn_wc_external_update_t handler, storing the received
+ data in a svn_cl__externals_store instance, which must be passed as
+ BATON. Ignore (and don't try to update) any of the BATON's hash
+ members when they are NULL. */
+svn_error_t *
+svn_cl__store_externals(void *baton,
+ const char *local_abspath,
+ const svn_string_t *old_value,
+ const svn_string_t *new_value,
+ svn_depth_t depth,
+ apr_pool_t *scratch_pool);
+
+/* Handle changes to the svn:externals property described by EXTERNALS_OLD,
EXTERNALS_NEW, and AMBIENT_DEPTHS. The tree's top level directory
is at TO_ABSPATH and corresponds to FROM_URL URL in the repository,
which has a root URL of REPOS_ROOT_URL. A write lock should be
@@ -1022,6 +1022,29 @@ svn_client__crawl_for_externals(apr_hash
apr_pool_t *scratch_pool,
apr_pool_t *result_pool);
+/* Baton type for svn_wc__external_info_gatherer(). All fields must be
+ populated before use. */
+typedef struct svn_client__external_func_baton_t
+{
+ apr_hash_t *externals_old;
+ apr_hash_t *externals_new;
+ apr_hash_t *ambient_depths;
+ apr_pool_t *result_pool;
+
+} svn_client__external_func_baton_t;
+
+
+/* This function gets invoked whenever external changes are encountered.
+ This implements svn_wc_external_update_t */
+svn_error_t *
+svn_client__external_info_gatherer(void *baton,
+ const char *local_abspath,
+ const svn_string_t *old_val,
+ const svn_string_t *new_val,
+ svn_depth_t depth,
+ apr_pool_t *scratch_pool);
+
+
/* Retrieve log messages using the first provided (non-NULL) callback
@@ -1099,30 +1122,6 @@ svn_cl__rev_default_to_peg(const svn_opt
const svn_opt_revision_t *peg_revision);
-/* Some external traversal helpers.
- */
-/* This function gets invoked whenever external changes are encountered.
- This implements svn_wc_external_update_t */
-svn_error_t *
-svn_client__external_info_gatherer(void *baton,
- const char *local_abspath,
- const svn_string_t *old_val,
- const svn_string_t *new_val,
- svn_depth_t depth,
- apr_pool_t *scratch_pool);
-
-/* Baton type for svn_wc__external_info_gatherer(). All fields must be
- populated before use. */
-typedef struct svn_client__external_func_baton_t
-{
- apr_hash_t *externals_old;
- apr_hash_t *externals_new;
- apr_hash_t *ambient_depths;
-
- apr_pool_t *result_pool;
-} svn_client__external_func_baton_t;
-
-
#ifdef __cplusplus