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/05/21 14:33:56 UTC

svn propchange: r946676 - svn:log

Author: julianfoad
Revision: 946676
Modified property: svn:log

Modified: svn:log at Fri May 21 12:33:56 2010
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri May 21 12:33:56 2010
@@ -1,27 +1,38 @@
-Replace read-only uses of svn_wc__text_base_path() and similar with new
-functions that are named to indicate this usage.  The new functions simply
-forward the call to the original functions, for now, but separating the
-read-only uses from the writes should make it easier to migrate them to use
-the WC-NG Pristine Store; at least it helps me to comprehend that process.
+Replace read-only uses of svn_wc__text_base_path() with calls to its
+recently introduced alias svn_wc__text_base_path_to_read(), and make and
+use similar read-only aliases for two other "get a base text path"
+variants.  The read-only aliases simply forward the call to the original
+functions, for now, but separating the read-only uses from the writes should
+make it easier to migrate them to use the WC-NG Pristine Store; at least it
+helps me to comprehend that process.
+
+Also rename the previously local function get_pristine_base_path() to
+svn_wc__ultimate_text_base_path() where it will lie alongside
+svn_wc__get_ultimate_base_contents() from r946689 and
+svn_wc__get_ultimate_base_md5_checksum() from 946713.  The name "ultimate
+base" is introduced here to mean "base as in WC-NG BASE_NODE table", as a
+hopefully clearer replacement for the term "pristine base" which was used
+recently in one or two function names but was not very good.  "Ultimate
+base" is not very good either.  We need to replace it with something better.
 
 * subversion/libsvn_wc/adm_files.h,
   subversion/libsvn_wc/adm_files.c
   (svn_wc__text_revert_path_to_read, svn_wc__ultimate_text_base_path,
    svn_wc__ultimate_text_base_path_to_read): New functions.
   (svn_wc__get_pristine_base_contents, svn_wc__get_pristine_contents): Use
-    the new functions.
+    the read-only aliases where the usage is definitely read-only.
 
 * subversion/libsvn_wc/adm_ops.c
-  (process_committed_leaf, svn_wc_get_pristine_copy_path): Use the new
-    functions.
+  (process_committed_leaf, svn_wc_get_pristine_copy_path): Use the read-only
+    aliases where the usage is definitely read-only.
 
 * subversion/libsvn_wc/diff.c
-  (get_nearest_pristine_text_as_file, report_wc_file_as_added): Use the new
-    functions.
+  (get_nearest_pristine_text_as_file, report_wc_file_as_added): Same.
+
+* subversion/libsvn_wc/workqueue.c
+  (verify_pristine_present, log_do_committed): Same.
 
 * subversion/libsvn_wc/update_editor.c
   (get_pristine_base_path): Move+rename to svn_wc__ultimate_text_base_path().
-  (merge_file, close_file): Use the new functions.
-
-* subversion/libsvn_wc/workqueue.c
-  (verify_pristine_present, log_do_committed): Use the new functions.
+  (merge_file, close_file): Update the call to get_pristine_base_path().
+    Use the read-only aliases where the usage is definitely read-only.