You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/13 17:21:54 UTC
svn commit: r1577225 - in /subversion/trunk/subversion:
libsvn_wc/adm_crawler.c libsvn_wc/externals.c libsvn_wc/update_editor.c
libsvn_wc/wc_db.h libsvn_wc/wc_db_pristine.c
tests/libsvn_wc/pristine-store-test.c
Author: rhuijben
Date: Thu Mar 13 16:21:53 2014
New Revision: 1577225
URL: http://svn.apache.org/r1577225
Log:
Following up on r1577109, reorder checksum arguments of
svn_wc__db_pristine_prepare_install to match the order of
svn_wc__db_pristine_install.
No functional changes.
* subversion/libsvn_wc/adm_crawler.c
(svn_wc__internal_transmit_text_deltas): Update caller.
* subversion/libsvn_wc/externals.c
(apply_textdelta): Update caller.
* subversion/libsvn_wc/update_editor.c
(lazy_open_target,
svn_wc_add_repos_file4): Update caller.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_pristine_prepare_install): Swap checksum arguments.
* subversion/libsvn_wc/wc_db_pristine.c
(svn_wc__db_pristine_prepare_install): Swap checksum arguments.
* subversion/tests/libsvn_wc/pristine-store-test.c
(pristine_write_read,
pristine_delete_while_open,
reject_mismatching_text): Update caller.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/externals.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1577225&r1=1577224&r2=1577225&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Thu Mar 13 16:21:53 2014
@@ -1040,7 +1040,7 @@ svn_wc__internal_transmit_text_deltas(co
SVN_ERR(svn_wc__db_pristine_prepare_install(&new_pristine_stream,
&new_pristine_tmp_abspath,
- NULL, &local_sha1_checksum,
+ &local_sha1_checksum, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
local_stream = copying_stream(local_stream, new_pristine_stream,
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1577225&r1=1577224&r2=1577225&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Thu Mar 13 16:21:53 2014
@@ -581,8 +581,8 @@ apply_textdelta(void *file_baton,
SVN_ERR(svn_wc__db_pristine_prepare_install(&dest_stream,
&eb->new_pristine_abspath,
- &eb->new_md5_checksum,
&eb->new_sha1_checksum,
+ &eb->new_md5_checksum,
eb->db, eb->wri_abspath,
eb->pool, pool));
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1577225&r1=1577224&r2=1577225&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Mar 13 16:21:53 2014
@@ -3627,8 +3627,8 @@ lazy_open_target(svn_stream_t **stream,
SVN_ERR(svn_wc__db_pristine_prepare_install(stream,
&hb->new_text_base_tmp_abspath,
- NULL,
&hb->new_text_base_sha1_checksum,
+ NULL,
hb->fb->edit_baton->db,
hb->fb->dir_baton->local_abspath,
result_pool, scratch_pool));
@@ -5342,8 +5342,8 @@ svn_wc_add_repos_file4(svn_wc_context_t
NEW_TEXT_BASE_MD5_CHECKSUM and NEW_TEXT_BASE_SHA1_CHECKSUM as we copy. */
SVN_ERR(svn_wc__db_pristine_prepare_install(&tmp_base_contents,
&tmp_text_base_abspath,
- &new_text_base_md5_checksum,
&new_text_base_sha1_checksum,
+ &new_text_base_md5_checksum,
wc_ctx->db, local_abspath,
scratch_pool, scratch_pool));
SVN_ERR(svn_stream_copy3(new_base_contents, tmp_base_contents,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1577225&r1=1577224&r2=1577225&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Thu Mar 13 16:21:53 2014
@@ -967,8 +967,8 @@ svn_wc__db_pristine_read(svn_stream_t **
svn_error_t *
svn_wc__db_pristine_prepare_install(svn_stream_t **stream,
const char **temp_base_abspath,
- svn_checksum_t **md5_checksum,
svn_checksum_t **sha1_checksum,
+ svn_checksum_t **md5_checksum,
svn_wc__db_t *db,
const char *wri_abspath,
apr_pool_t *result_pool,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c?rev=1577225&r1=1577224&r2=1577225&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c Thu Mar 13 16:21:53 2014
@@ -359,8 +359,8 @@ pristine_install_txn(svn_sqlite__db_t *s
svn_error_t *
svn_wc__db_pristine_prepare_install(svn_stream_t **stream,
const char **temp_base_abspath,
- svn_checksum_t **md5_checksum,
svn_checksum_t **sha1_checksum,
+ svn_checksum_t **md5_checksum,
svn_wc__db_t *db,
const char *wri_abspath,
apr_pool_t *result_pool,
Modified: subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c?rev=1577225&r1=1577224&r2=1577225&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/pristine-store-test.c Thu Mar 13 16:21:53 2014
@@ -93,7 +93,7 @@ pristine_write_read(const svn_test_opts_
* to its path and set DATA_SHA1 and DATA_MD5 to its checksums. */
SVN_ERR(svn_wc__db_pristine_prepare_install(&pristine_stream,
&pristine_tmp_abspath,
- &data_md5, &data_sha1,
+ &data_sha1, &data_md5,
db, wc_abspath,
pool, pool));
@@ -190,7 +190,7 @@ pristine_delete_while_open(const svn_tes
SVN_ERR(svn_wc__db_pristine_prepare_install(&pristine_stream,
&pristine_tmp_abspath,
- &data_md5, &data_sha1,
+ &data_sha1, &data_md5,
db, wc_abspath,
pool, pool));
@@ -263,7 +263,7 @@ reject_mismatching_text(const svn_test_o
SVN_ERR(svn_wc__db_pristine_prepare_install(&pristine_stream,
&pristine_abspath,
- &data_md5, &data_sha1,
+ &data_sha1, &data_md5,
db, wc_abspath,
pool, pool));
@@ -285,7 +285,7 @@ reject_mismatching_text(const svn_test_o
SVN_ERR(svn_wc__db_pristine_prepare_install(&pristine_stream,
&pristine_abspath,
- &data_md5, &data_sha1,
+ &data_sha1, &data_md5,
db, wc_abspath,
pool, pool));