svn commit: r948459 - /subversion/trunk/subversion/libsvn_wc/workqueue.c

[ju...@apache.org]

Author: julianfoad
Date: Wed May 26 14:47:25 2010
New Revision: 948459

URL: http://svn.apache.org/viewvc?rev=948459&view=rev
Log:
Another step to avoid exposing a pristine text file's path.

* subversion/libsvn_wc/workqueue.c
  (log_do_committed): Use svn_wc__internal_text_modified_p() instead of
    svn_wc__internal_versioned_file_modcheck(), to avoid having to get the
    pristine text file's path.

Modified:
    subversion/trunk/subversion/libsvn_wc/workqueue.c

Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=948459&r1=948458&r2=948459&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Wed May 26 14:47:25 2010
@@ -1468,14 +1468,14 @@ log_do_committed(svn_wc__db_t *db,
           modified = finfo.size != basef_finfo.size;
           if (finfo.mtime != basef_finfo.mtime && ! modified)
             {
-              const char *base_abspath;
-
-              SVN_ERR(svn_wc__text_base_path_to_read(&base_abspath,
-                                                     db, local_abspath,
-                                                     pool, pool));
-              SVN_ERR(svn_wc__internal_versioned_file_modcheck(
-                        &modified,
-                        db, local_abspath, base_abspath, FALSE, pool));
+              /* Compare the texts.  Don't use
+                 svn_wc__internal_text_modified_p's ability to compare
+                 against the *recorded* size and time stamp because that's
+                 not what we are interested in right here. */
+              SVN_ERR(svn_wc__internal_text_modified_p(
+                        &modified, db, local_abspath,
+                        TRUE /* force_comparison */,
+                        FALSE /* compare_textbases */, pool));
             }
           /* If they are the same, use the working file's timestamp,
              else use the base file's timestamp. */