Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r933715 - in /subversion/trunk/subversion/libsvn_wc:
 adm_crawler.c adm_ops.c entries.c questions.c update_editor.c
Date: Tue, 13 Apr 2010 17:36:56 -0000
To: commits@subversion.apache.org
From: julianfoad@apache.org
Message-Id: <20100413173656.3FE482388905@eris.apache.org>

Author: julianfoad
Date: Tue Apr 13 17:36:55 2010
New Revision: 933715

URL: http://svn.apache.org/viewvc?rev=933715&view=rev
Log:
Add comments in all the places where a pristine text checksum is read from
the WC DB, noting that we'll be changing the checksum kind from MD-5 to SHA-1.
(Put the comments in #ifdef SVN_EXPERIMENTAL, to associate them with other
related code.  We'll get rid of these #ifdefs as soon as this stuff is in a
viable transitional state.)

* subversion/libsvn_wc/adm_crawler.c
  (svn_wc__internal_transmit_text_deltas): Add a comment.

* subversion/libsvn_wc/adm_ops.c
  (process_committed_leaf): Add a comment.

* subversion/libsvn_wc/entries.c
  (get_base_info_for_deleted, write_one_entry_cb): Add a comment.

* subversion/libsvn_wc/questions.c
  (compare_and_verify): Add a comment.

* subversion/libsvn_wc/update_editor.c
  (close_file): Add a comment.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_crawler.c
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/entries.c
    subversion/trunk/subversion/libsvn_wc/questions.c
    subversion/trunk/subversion/libsvn_wc/update_editor.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=933715&r1=933714&r2=933715&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Apr 13 17:36:55 2010
@@ -1119,6 +1119,10 @@ svn_wc__internal_transmit_text_deltas(co
                                    db, local_abspath,
                                    scratch_pool, scratch_pool));
 
+#ifdef SVN_EXPERIMENTAL
+      /* ### expected_checksum is originally MD-5 but will later be SHA-1... */
+#endif
+
       /* ### We want expected_checksum to ALWAYS be present, but on old
          ### working copies maybe it won't be (unclear?). If it is there,
          ### then we can use it as an expected value. If it is NOT there,

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=933715&r1=933714&r2=933715&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Apr 13 17:36:55 2010
@@ -377,6 +377,10 @@ process_committed_leaf(svn_wc__db_t *db,
                                db, local_abspath,
                                scratch_pool, scratch_pool));
 
+#ifdef SVN_EXPERIMENTAL
+  /* ### copied_checksum is originally MD-5 but will later be SHA-1... */
+#endif
+
   if (kind == svn_wc__db_kind_dir)
     adm_abspath = local_abspath;
   else

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=933715&r1=933714&r2=933715&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue Apr 13 17:36:55 2010
@@ -267,6 +267,10 @@ get_base_info_for_deleted(svn_wc_entry_t
                                  entry_abspath,
                                  result_pool,
                                  scratch_pool);
+#ifdef SVN_EXPERIMENTAL
+  /* ### *checksum is originally MD-5 but will later be SHA-1... */
+#endif
+
   if (err)
     {
       const char *work_del_abspath;
@@ -2440,6 +2444,10 @@ write_one_entry_cb(void *baton,
                                            scratch_pool);
 
       err = svn_sqlite__column_checksum(&base_checksum, stmt, 5, scratch_pool);
+#ifdef SVN_EXPERIMENTAL
+      /* ### base_checksum is originally MD-5 but will later be SHA-1... */
+#endif
+
       SVN_ERR(svn_error_compose_create(err, svn_sqlite__reset(stmt)));
     }
   else

Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=933715&r1=933714&r2=933715&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Tue Apr 13 17:36:55 2010
@@ -138,6 +138,10 @@ compare_and_verify(svn_boolean_t *modifi
                                        db, versioned_file_abspath,
                                        scratch_pool, scratch_pool));
 
+#ifdef SVN_EXPERIMENTAL
+          /* ### node_checksum is originally MD-5 but will later be SHA-1... */
+#endif
+
           if (node_checksum)
             pristine_stream = svn_stream_checksummed2(pristine_stream,
                                                       &checksum, NULL,

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=933715&r1=933714&r2=933715&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Apr 13 17:36:55 2010
@@ -4852,6 +4852,10 @@ close_file(void *file_baton,
                                          &new_checksum, NULL, NULL, NULL,
                                          eb->db, fb->local_abspath,
                                          pool, pool));
+#ifdef SVN_EXPERIMENTAL
+        /* ### new_checksum is originally MD-5 but will later be SHA-1... */
+#endif
+
       }
 
     SVN_ERR(svn_wc__db_base_add_file(eb->db, fb->local_abspath,