You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/04/26 19:26:18 UTC
svn commit: r938134 - in /subversion/trunk/subversion: include/svn_wc.h
libsvn_wc/adm_ops.c libsvn_wc/deprecated.c libsvn_wc/wc.h
Author: julianfoad
Date: Mon Apr 26 17:26:17 2010
New Revision: 938134
URL: http://svn.apache.org/viewvc?rev=938134&view=rev
Log:
Rename MD-5 checksum parameters from 'checksum' to 'md5_checksum' to pave
the way for adding SHA-1 checksums.
* subversion/include/svn_wc.h
(svn_wc_queue_committed3, svn_wc_queue_committed2): Rename a parameter.
* subversion/libsvn_wc/adm_ops.c
(committed_queue_item_t): Rename a member.
(svn_wc_queue_committed3): Rename a parameter.
(svn_wc__process_committed_internal, svn_wc_process_committed_queue2):
Adjust accordingly.
* subversion/libsvn_wc/deprecated.c
(svn_wc_queue_committed2): Rename a parameter.
(svn_wc_queue_committed): Rename local variables.
Modified:
subversion/trunk/subversion/include/svn_wc.h
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/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=938134&r1=938133&r2=938134&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Mon Apr 26 17:26:17 2010
@@ -4914,7 +4914,7 @@ svn_wc_committed_queue_create(apr_pool_t
* If @a remove_changelist is @c TRUE, any association with a
* changelist will be removed.
*
- * If @a local_abspath is a file and @a checksum is non-NULL, use @a checksum
+ * If @a local_abspath is a file and @a md5_checksum is non-NULL, use @a md5_checksum
* as the checksum for the new text base. Otherwise, calculate the checksum
* if needed.
* ### [JAF] No, it doesn't calculate the checksum, it stores null in wc.db:
@@ -4930,20 +4930,20 @@ svn_wc_committed_queue_create(apr_pool_t
* 'wcprop_changes' = NULL;
* 'remove_lock' = FALSE;
* 'remove_changelist' from the recursive parent item;
- * 'checksum' from the child item in the queue;
+ * 'md5_checksum' from the child item in the queue;
* and any children (at any depth) of that directory that are NOT in
* the queue as separate items will get:
* 'wcprop_changes' = NULL;
* 'remove_lock' = FALSE;
* 'remove_changelist' from the recursive parent item;
- * 'checksum' = NULL ### means what?
+ * 'md5_checksum' = NULL ### means what?
*
* @note the @a recurse parameter should be used with extreme care since
* it will bump ALL nodes under the directory, regardless of their
* actual inclusion in the new revision.
*
* All pointer data passed to this function (@a local_abspath,
- * @a wcprop_changes and @a checksum) should remain valid until the
+ * @a wcprop_changes and @a md5_checksum) should remain valid until the
* queue has been processed by svn_wc_process_committed_queue2().
*
* Temporary allocations will be performed in @a scratch_pool, and persistent
@@ -4958,7 +4958,7 @@ svn_wc_queue_committed3(svn_wc_committed
const apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
svn_boolean_t remove_changelist,
- const svn_checksum_t *checksum,
+ const svn_checksum_t *md5_checksum,
apr_pool_t *scratch_pool);
/** Same as svn_wc_queue_committed3() except @a path doesn't have to be an
@@ -4977,7 +4977,7 @@ svn_wc_queue_committed2(svn_wc_committed
const apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
svn_boolean_t remove_changelist,
- const svn_checksum_t *checksum,
+ const svn_checksum_t *md5_checksum,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=938134&r1=938133&r2=938134&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Mon Apr 26 17:26:17 2010
@@ -83,7 +83,7 @@ typedef struct
svn_boolean_t recurse;
svn_boolean_t no_unlock;
svn_boolean_t keep_changelist;
- const svn_checksum_t *checksum;
+ const svn_checksum_t *md5_checksum;
apr_hash_t *new_dav_cache;
} committed_queue_item_t;
@@ -444,7 +444,7 @@ svn_wc__process_committed_internal(svn_w
apr_hash_t *new_dav_cache,
svn_boolean_t no_unlock,
svn_boolean_t keep_changelist,
- const svn_checksum_t *checksum,
+ const svn_checksum_t *md5_checksum,
const svn_wc_committed_queue_t *queue,
apr_pool_t *scratch_pool)
{
@@ -456,7 +456,7 @@ svn_wc__process_committed_internal(svn_w
new_revnum, new_date, rev_author,
new_dav_cache,
no_unlock, keep_changelist,
- checksum, scratch_pool));
+ md5_checksum, scratch_pool));
if (recurse && kind == svn_wc__db_kind_dir)
{
@@ -502,7 +502,7 @@ svn_wc__process_committed_internal(svn_w
if (status == svn_wc__db_status_excluded)
continue;
- checksum = NULL;
+ md5_checksum = NULL;
if (kind != svn_wc__db_kind_dir)
{
/* Suppress log creation for deleted entries in a replaced
@@ -529,7 +529,7 @@ svn_wc__process_committed_internal(svn_w
APR_HASH_KEY_STRING);
if (cqi != NULL)
- checksum = cqi->checksum;
+ md5_checksum = cqi->md5_checksum;
}
}
@@ -543,7 +543,7 @@ svn_wc__process_committed_internal(svn_w
NULL,
TRUE /* no_unlock */,
keep_changelist,
- checksum,
+ md5_checksum,
queue, iterpool));
if (kind == svn_wc__db_kind_dir)
@@ -600,7 +600,7 @@ svn_wc_queue_committed3(svn_wc_committed
const apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
svn_boolean_t remove_changelist,
- const svn_checksum_t *checksum,
+ const svn_checksum_t *md5_checksum,
apr_pool_t *scratch_pool)
{
committed_queue_item_t *cqi;
@@ -619,7 +619,7 @@ svn_wc_queue_committed3(svn_wc_committed
cqi->recurse = recurse;
cqi->no_unlock = !remove_lock;
cqi->keep_changelist = !remove_changelist;
- cqi->checksum = checksum;
+ cqi->md5_checksum = md5_checksum;
cqi->new_dav_cache = svn_wc__prop_array_to_hash(wcprop_changes, queue->pool);
apr_hash_set(queue->queue, local_abspath, APR_HASH_KEY_STRING, cqi);
@@ -699,7 +699,7 @@ svn_wc_process_committed_queue2(svn_wc_c
cqi->new_dav_cache,
cqi->no_unlock,
cqi->keep_changelist,
- cqi->checksum, queue,
+ cqi->md5_checksum, queue,
iterpool));
SVN_ERR(svn_wc__wq_run(wc_ctx->db, cqi->local_abspath, NULL, NULL,
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=938134&r1=938133&r2=938134&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Mon Apr 26 17:26:17 2010
@@ -3751,14 +3751,14 @@ svn_wc_queue_committed2(svn_wc_committed
const apr_array_header_t *wcprop_changes,
svn_boolean_t remove_lock,
svn_boolean_t remove_changelist,
- const svn_checksum_t *checksum,
+ const svn_checksum_t *md5_checksum,
apr_pool_t *scratch_pool)
{
const char *local_abspath;
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, scratch_pool));
return svn_wc_queue_committed3(queue, local_abspath, recurse, wcprop_changes,
- remove_lock, remove_changelist, checksum,
+ remove_lock, remove_changelist, md5_checksum,
scratch_pool);
}
@@ -3773,18 +3773,18 @@ svn_wc_queue_committed(svn_wc_committed_
const unsigned char *digest,
apr_pool_t *pool)
{
- const svn_checksum_t *checksum;
+ const svn_checksum_t *md5_checksum;
if (digest)
- checksum = svn_checksum__from_digest(
+ md5_checksum = svn_checksum__from_digest(
digest, svn_checksum_md5,
svn_wc__get_committed_queue_pool(*queue));
else
- checksum = NULL;
+ md5_checksum = NULL;
return svn_wc_queue_committed2(*queue, path, adm_access, recurse,
wcprop_changes, remove_lock,
- remove_changelist, checksum, pool);
+ remove_changelist, md5_checksum, pool);
}
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=938134&r1=938133&r2=938134&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Mon Apr 26 17:26:17 2010
@@ -215,9 +215,9 @@ svn_wc__get_committed_queue_pool(const s
* If @keep_changelist is set, don't remove any changeset assignments
* from @a local_abspath; otherwise, clear it of such assignments.
*
- * If @a local_abspath is a file and @a checksum is non-NULL, use @a checksum
- * as the checksum for the new text base. Otherwise, calculate the checksum
- * if needed.
+ * If @a local_abspath is a file and @a md5_checksum is non-NULL, use
+ * @a md5_checksum as the checksum for the new text base. Otherwise,
+ * calculate the checksum if needed.
* ### [JAF] No, it doesn't calculate the checksum, it stores null in wc.db.
*/
svn_error_t *
@@ -230,7 +230,7 @@ svn_wc__process_committed_internal(svn_w
apr_hash_t *new_dav_cache,
svn_boolean_t no_unlock,
svn_boolean_t keep_changelist,
- const svn_checksum_t *checksum,
+ const svn_checksum_t *md5_checksum,
const svn_wc_committed_queue_t *queue,
apr_pool_t *scratch_pool);