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/03/10 18:27:12 UTC
svn commit: r921462 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
deprecated.c wc.h
Author: cmpilato
Date: Wed Mar 10 17:27:12 2010
New Revision: 921462
URL: http://svn.apache.org/viewvc?rev=921462&view=rev
Log:
Jump the hoops required to get another deprecated function into
deprecated.c. (It helps the count-progress.py statistics look
marginally better.)
* subversion/libsvn_wc/wc.h,
* subversion/libsvn_wc/adm_ops.c
(svn_wc__get_committed_queue_pool): New.
(svn_wc_queue_committed): Move to deprecated.c.
* subversion/libsvn_wc/deprecated.c
(svn_wc_queue_committed): Move from adm_ops.c, and use
svn_wc__get_committed_queue_pool() to peek into the queue struct.
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=921462&r1=921461&r2=921462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Mar 10 17:27:12 2010
@@ -84,6 +84,13 @@ typedef struct
} committed_queue_item_t;
+apr_pool_t *
+svn_wc__get_committed_queue_pool(struct svn_wc_committed_queue_t *queue)
+{
+ return queue->pool;
+}
+
+
/*** Finishing updates and commits. ***/
@@ -642,34 +649,6 @@ svn_wc_queue_committed3(svn_wc_committed
return SVN_NO_ERROR;
}
-/* NOTE: this function doesn't move to deprecated.c because of its need
- for the internals of svn_wc_committed_queue_t. */
-svn_error_t *
-svn_wc_queue_committed(svn_wc_committed_queue_t **queue,
- const char *path,
- svn_wc_adm_access_t *adm_access,
- svn_boolean_t recurse,
- const apr_array_header_t *wcprop_changes,
- svn_boolean_t remove_lock,
- svn_boolean_t remove_changelist,
- const unsigned char *digest,
- apr_pool_t *pool)
-{
- const svn_checksum_t *checksum;
-
- if (digest)
- checksum = svn_checksum__from_digest(digest, svn_checksum_md5,
- (*queue)->pool);
- else
- checksum = NULL;
-
- return svn_wc_queue_committed2(*queue, path, adm_access, recurse,
- wcprop_changes, remove_lock,
- remove_changelist,
- checksum, pool);
-}
-
-
/* Return TRUE if any item of QUEUE is a parent of ITEM and will be
processed recursively, return FALSE otherwise.
*/
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=921462&r1=921461&r2=921462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Wed Mar 10 17:27:12 2010
@@ -3676,6 +3676,30 @@ svn_wc_queue_committed2(svn_wc_committed
scratch_pool);
}
+svn_error_t *
+svn_wc_queue_committed(svn_wc_committed_queue_t **queue,
+ const char *path,
+ svn_wc_adm_access_t *adm_access,
+ svn_boolean_t recurse,
+ const apr_array_header_t *wcprop_changes,
+ svn_boolean_t remove_lock,
+ svn_boolean_t remove_changelist,
+ const unsigned char *digest,
+ apr_pool_t *pool)
+{
+ const svn_checksum_t *checksum;
+
+ if (digest)
+ checksum = svn_checksum__from_digest(
+ digest, svn_checksum_md5,
+ svn_wc__get_committed_queue_pool(*queue));
+ else
+ checksum = NULL;
+
+ return svn_wc_queue_committed2(*queue, path, adm_access, recurse,
+ wcprop_changes, remove_lock,
+ remove_changelist, checksum, pool);
+}
svn_error_t *
svn_wc_process_committed_queue(svn_wc_committed_queue_t *queue,
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=921462&r1=921461&r2=921462&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Wed Mar 10 17:27:12 2010
@@ -180,6 +180,18 @@ svn_wc__context_create_with_db(svn_wc_co
apr_pool_t *result_pool);
+/*** Committed Queue ***/
+
+/**
+ * Return the pool associated with QUEUE. (This so we can keep some
+ * deprecated functions that need to peek inside the QUEUE struct in
+ * deprecated.c).
+ */
+apr_pool_t *
+svn_wc__get_committed_queue_pool(struct svn_wc_committed_queue_t *queue);
+
+
+
/*** Update traversals. ***/
struct svn_wc_traversal_info_t