You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/21 09:56:58 UTC
svn commit: r1388362 - in /subversion/branches/10Gb/subversion:
libsvn_delta/text_delta.c libsvn_fs_fs/fs_fs.c libsvn_repos/reporter.c
Author: stefan2
Date: Fri Sep 21 07:56:58 2012
New Revision: 1388362
URL: http://svn.apache.org/viewvc?rev=1388362&view=rev
Log:
On 10Gb branch: Fix try_process_file_contents code plus
a handful of bugs masked by the first.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__try_process_file_contents): pass the right key
* subversion/libsvn_delta/text_delta.c
(svn_txdelta_send_contents): forward iterate
* subversion/libsvn_repos/reporter.c
(send_zero_copy_delta): set success flag
(delta_files): fix baton initialization
Modified:
subversion/branches/10Gb/subversion/libsvn_delta/text_delta.c
subversion/branches/10Gb/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/10Gb/subversion/libsvn_repos/reporter.c
Modified: subversion/branches/10Gb/subversion/libsvn_delta/text_delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/10Gb/subversion/libsvn_delta/text_delta.c?rev=1388362&r1=1388361&r2=1388362&view=diff
==============================================================================
--- subversion/branches/10Gb/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/branches/10Gb/subversion/libsvn_delta/text_delta.c Fri Sep 21 07:56:58 2012
@@ -1022,7 +1022,7 @@ svn_txdelta_send_contents(const unsigned
new_data.data = (const char*)contents;
/* update remaining */
- contents -= window.tview_len;
+ contents += window.tview_len;
len -= window.tview_len;
/* shove it at the handler */
Modified: subversion/branches/10Gb/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/10Gb/subversion/libsvn_fs_fs/fs_fs.c?rev=1388362&r1=1388361&r2=1388362&view=diff
==============================================================================
--- subversion/branches/10Gb/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/10Gb/subversion/libsvn_fs_fs/fs_fs.c Fri Sep 21 07:56:58 2012
@@ -5150,7 +5150,7 @@ svn_fs_fs__try_process_file_contents(svn
void *dummy = NULL;
return svn_cache__get_partial(&dummy, success,
- ffd->fulltext_cache, &fulltext_key,
+ ffd->fulltext_cache, fulltext_key,
cache_access_wrapper, &wrapper_baton,
pool);
}
Modified: subversion/branches/10Gb/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/branches/10Gb/subversion/libsvn_repos/reporter.c?rev=1388362&r1=1388361&r2=1388362&view=diff
==============================================================================
--- subversion/branches/10Gb/subversion/libsvn_repos/reporter.c (original)
+++ subversion/branches/10Gb/subversion/libsvn_repos/reporter.c Fri Sep 21 07:56:58 2012
@@ -636,7 +636,7 @@ send_zero_copy_delta(const unsigned char
zero_copy_baton->dbaton, pool));
/* all fine now */
- zero_copy_baton->zero_copy_succeeded = FALSE;
+ zero_copy_baton->zero_copy_succeeded = TRUE;
return SVN_NO_ERROR;
}
@@ -698,7 +698,10 @@ delta_files(report_baton_t *b, void *fil
zero-copy code. */
if (b->zero_copy_limit > 0 && s_path == NULL)
{
- zero_copy_baton_t baton = {b->zero_copy_limit, dbaton, FALSE};
+ zero_copy_baton_t baton = { b->zero_copy_limit
+ , dhandler
+ , dbaton
+ , FALSE};
svn_boolean_t called = FALSE;
SVN_ERR(svn_fs_try_process_file_contents(&called,
b->t_root, t_path,