subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1241531 - in /subversion/trunk/subversion: libsvn_client/repos_diff.c libsvn_delta/compat.c libsvn_fs_base/tree.c libsvn_fs_fs/tree.c libsvn_wc/externals.c libsvn_wc/update_editor.c
Date Tue, 07 Feb 2012 17:49:27 GMT
Author: hwright
Date: Tue Feb  7 17:49:27 2012
New Revision: 1241531

URL: http://svn.apache.org/viewvc?rev=1241531&view=rev
Log:
Revert r1241097, persuant to the discussion in this thread:
http://svn.haxx.se/dev/archive-2012-02/0116.shtml

Modified:
    subversion/trunk/subversion/libsvn_client/repos_diff.c
    subversion/trunk/subversion/libsvn_delta/compat.c
    subversion/trunk/subversion/libsvn_fs_base/tree.c
    subversion/trunk/subversion/libsvn_fs_fs/tree.c
    subversion/trunk/subversion/libsvn_wc/externals.c
    subversion/trunk/subversion/libsvn_wc/update_editor.c

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1241531&r1=1241530&r2=1241531&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Tue Feb  7 17:49:27 2012
@@ -906,8 +906,7 @@ apply_textdelta(void *file_baton,
       SVN_ERR(svn_checksum_parse_hex(&base_md5_checksum, svn_checksum_md5,
                                      base_md5_digest, scratch_pool));
 
-      if (!svn_checksum_is_empty_checksum(base_md5_checksum) &&
-            !svn_checksum_match(base_md5_checksum, b->start_md5_checksum))
+      if (!svn_checksum_match(base_md5_checksum, b->start_md5_checksum))
         return svn_error_trace(svn_checksum_mismatch_err(
                                       base_md5_checksum,
                                       b->start_md5_checksum,

Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1241531&r1=1241530&r2=1241531&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Tue Feb  7 17:49:27 2012
@@ -1593,15 +1593,8 @@ drive_tree(struct operation *op,
               svn_txdelta_window_handler_t handler;
               void *handler_baton;
               svn_stream_t *contents;
-              const char *empty_md5;
-              
-              /* ### We could probably allocate this just once somewhere. */
-              empty_md5 = svn_checksum_to_cstring(svn_checksum_empty_checksum(
-                                            svn_checksum_md5, scratch_pool),
-                                            scratch_pool);
 
-              SVN_ERR(editor->apply_textdelta(file_baton, empty_md5,
-                                              scratch_pool,
+              SVN_ERR(editor->apply_textdelta(file_baton, NULL, scratch_pool,
                                               &handler, &handler_baton));
               SVN_ERR(svn_stream_open_readonly(&contents, op->src_file,
                                                scratch_pool, scratch_pool));

Modified: subversion/trunk/subversion/libsvn_fs_base/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/tree.c?rev=1241531&r1=1241530&r2=1241531&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/tree.c Tue Feb  7 17:49:27 2012
@@ -3743,7 +3743,6 @@ txn_body_apply_textdelta(void *baton, tr
          reps-strings.c.  Could we keep them both around somehow so this
          check could be more comprehensive? */
       if (tb->base_checksum->kind == checksum->kind
-            && !svn_checksum_is_empty_checksum(tb->base_checksum)
             && !svn_checksum_match(tb->base_checksum, checksum))
         return svn_checksum_mismatch_err(tb->base_checksum, checksum,
                             trail->pool,

Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1241531&r1=1241530&r2=1241531&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Tue Feb  7 17:49:27 2012
@@ -2437,8 +2437,7 @@ apply_textdelta(void *baton, apr_pool_t 
          contents, in other words, the base text. */
       SVN_ERR(svn_fs_fs__dag_file_checksum(&checksum, tb->node,
                                            tb->base_checksum->kind, pool));
-      if (!svn_checksum_is_empty_checksum(tb->base_checksum)
-            && !svn_checksum_match(tb->base_checksum, checksum))
+      if (!svn_checksum_match(tb->base_checksum, checksum))
         return svn_checksum_mismatch_err(tb->base_checksum, checksum, pool,
                                          _("Base checksum mismatch on '%s'"),
                                          tb->path);

Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1241531&r1=1241530&r2=1241531&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Tue Feb  7 17:49:27 2012
@@ -500,8 +500,7 @@ apply_textdelta(void *file_baton,
           else
             original_md5 = eb->original_checksum;
 
-          if (!svn_checksum_is_empty_checksum(expected_checksum)
-                && !svn_checksum_match(expected_checksum, original_md5))
+          if (!svn_checksum_match(expected_checksum, original_md5))
             return svn_error_trace(svn_checksum_mismatch_err(
                                     expected_checksum,
                                     original_md5,

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1241531&r1=1241530&r2=1241531&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Feb  7 17:49:27 2012
@@ -3617,8 +3617,7 @@ apply_textdelta(void *file_baton,
                                         recorded_base_checksum, pool, pool));
 
 
-  if (!svn_checksum_is_empty_checksum(expected_base_checksum)
-        && !svn_checksum_match(expected_base_checksum, recorded_base_checksum))
+  if (!svn_checksum_match(expected_base_checksum, recorded_base_checksum))
       return svn_error_createf(SVN_ERR_WC_CORRUPT_TEXT_BASE, NULL,
                      _("Checksum mismatch for '%s':\n"
                        "   expected:  %s\n"



Mime
View raw message