You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/04/12 17:17:11 UTC
svn commit: r1091453 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
diff.c questions.c status.c update_editor.c wc.h wc_db.c workqueue.c
Author: cmpilato
Date: Tue Apr 12 15:17:10 2011
New Revision: 1091453
URL: http://svn.apache.org/viewvc?rev=1091453&view=rev
Log:
Remove a module-private function that trivially wrapped another
module-private function.
* subversion/libsvn_wc/wc.h
(svn_wc__internal_text_modified_p): Remove.
* subversion/libsvn_wc/questions.c
(svn_wc__internal_text_modified_p): Remove.
(svn_wc_text_modified_p2): Now use svn_wc__internal_file_modified_p().
* subversion/libsvn_wc/adm_ops.c
(svn_wc__internal_remove_from_revision_control): Now use
svn_wc__internal_file_modified_p().
* subversion/libsvn_wc/diff.c
(file_diff, close_file): Now use svn_wc__internal_file_modified_p().
* subversion/libsvn_wc/status.c
(assemble_status): Now use svn_wc__internal_file_modified_p().
* subversion/libsvn_wc/update_editor.c
(entry_has_local_mods, merge_file): Now use
svn_wc__internal_file_modified_p().
* subversion/libsvn_wc/wc_db.c
(has_local_mods): Now use svn_wc__internal_file_modified_p().
* subversion/libsvn_wc/workqueue.c
(log_do_committed): Now use svn_wc__internal_file_modified_p().
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/diff.c
subversion/trunk/subversion/libsvn_wc/questions.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Apr 12 15:17:10 2011
@@ -1827,7 +1827,8 @@ svn_wc__internal_remove_from_revision_co
if (wc_special || ! local_special)
{
/* Check for local mods. before removing entry */
- SVN_ERR(svn_wc__internal_text_modified_p(&text_modified_p, db,
+ SVN_ERR(svn_wc__internal_file_modified_p(&text_modified_p, NULL,
+ NULL, db,
local_abspath, FALSE,
TRUE, scratch_pool));
if (text_modified_p && instant_error)
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Tue Apr 12 15:17:10 2011
@@ -721,7 +721,7 @@ file_diff(struct dir_baton *db,
svn_boolean_t modified;
/* Here we deal with showing pure modifications. */
- SVN_ERR(svn_wc__internal_text_modified_p(&modified, eb->db,
+ SVN_ERR(svn_wc__internal_file_modified_p(&modified, NULL, NULL, eb->db,
local_abspath, FALSE, TRUE,
pool));
if (modified)
@@ -1683,7 +1683,7 @@ close_file(void *file_baton,
(BASE:WORKING) modifications. */
modified = (fb->temp_file_path != NULL);
if (!modified && !eb->use_text_base)
- SVN_ERR(svn_wc__internal_text_modified_p(&modified, eb->db,
+ SVN_ERR(svn_wc__internal_file_modified_p(&modified, NULL, NULL, eb->db,
fb->local_abspath,
FALSE, TRUE, pool));
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Tue Apr 12 15:17:10 2011
@@ -243,21 +243,6 @@ svn_wc__internal_versioned_file_modcheck
}
svn_error_t *
-svn_wc__internal_text_modified_p(svn_boolean_t *modified_p,
- svn_wc__db_t *db,
- const char *local_abspath,
- svn_boolean_t force_comparison,
- svn_boolean_t compare_textbases,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR(svn_wc__internal_file_modified_p(modified_p, NULL, NULL,
- db, local_abspath,
- force_comparison, compare_textbases,
- scratch_pool));
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
svn_wc__internal_file_modified_p(svn_boolean_t *modified_p,
svn_boolean_t *executable_p,
svn_boolean_t *read_only_p,
@@ -408,7 +393,7 @@ svn_wc_text_modified_p2(svn_boolean_t *m
svn_boolean_t force_comparison,
apr_pool_t *scratch_pool)
{
- return svn_wc__internal_text_modified_p(modified_p, wc_ctx->db,
+ return svn_wc__internal_file_modified_p(modified_p, NULL, NULL, wc_ctx->db,
local_abspath, force_comparison,
TRUE, scratch_pool);
}
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Apr 12 15:17:10 2011
@@ -520,8 +520,8 @@ assemble_status(svn_wc_status3_t **statu
text_modified_p = FALSE;
else
{
- err = svn_wc__internal_text_modified_p(&text_modified_p,
- db, local_abspath,
+ err = svn_wc__internal_file_modified_p(&text_modified_p, NULL,
+ NULL, db, local_abspath,
FALSE, TRUE,
scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Apr 12 15:17:10 2011
@@ -1185,7 +1185,8 @@ entry_has_local_mods(svn_boolean_t *modi
/* Check for text modifications */
if (kind == svn_wc__db_kind_file
|| kind == svn_wc__db_kind_symlink)
- SVN_ERR(svn_wc__internal_text_modified_p(&text_modified, db, local_abspath,
+ SVN_ERR(svn_wc__internal_file_modified_p(&text_modified, NULL, NULL,
+ db, local_abspath,
FALSE, TRUE, scratch_pool));
else
text_modified = FALSE;
@@ -3455,8 +3456,8 @@ merge_file(svn_skel_t **work_items,
This function sets is_locally_modified to FALSE for
files that do not exist and for directories. */
- SVN_ERR(svn_wc__internal_text_modified_p(&is_locally_modified, eb->db,
- fb->local_abspath,
+ SVN_ERR(svn_wc__internal_file_modified_p(&is_locally_modified, NULL,
+ NULL, eb->db, fb->local_abspath,
FALSE /* force_comparison */,
FALSE /* compare_textbases */,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Tue Apr 12 15:17:10 2011
@@ -369,7 +369,10 @@ void svn_wc__compat_call_notify_func(voi
apr_pool_t *pool);
/* Set *MODIFIED_P to non-zero if LOCAL_ABSPATH's text is modified with
- * regard to the base revision, else set *MODIFIED_P to zero.
+ * regard to the base revision, else set *MODIFIED_P to zero. Also
+ * set *EXECUTABLE_P and *READ_ONLY_P based on the files current
+ * permissions. (EXECUTABLE_P and READ_ONLY_P can individually be
+ * NULL if the caller doesn't care about those attributes of the file.)
*
* If FORCE_COMPARISON is true, this function will not allow early
* return mechanisms that avoid actual content comparison. Instead,
@@ -390,20 +393,6 @@ void svn_wc__compat_call_notify_func(voi
* addition), return the error SVN_ERR_ENTRY_NOT_FOUND.
*/
svn_error_t *
-svn_wc__internal_text_modified_p(svn_boolean_t *modified_p,
- svn_wc__db_t *db,
- const char *local_abspath,
- svn_boolean_t force_comparison,
- svn_boolean_t compare_textbases,
- apr_pool_t *scratch_pool);
-
-
-/* Like svn_wc__internal_text_modified_p but also sets *EXECUTABLE_P
- * and *READ_ONLY_P based on the files current permissions.
- *
- * EXECUTABLE_P and READ_ONLY_P can be NULL.
- */
-svn_error_t *
svn_wc__internal_file_modified_p(svn_boolean_t *modified_p,
svn_boolean_t *executable_p,
svn_boolean_t *read_only_p,
@@ -414,7 +403,6 @@ svn_wc__internal_file_modified_p(svn_boo
apr_pool_t *scratch_pool);
-
/* Merge the difference between LEFT_ABSPATH and RIGHT_ABSPATH into
TARGET_ABSPATH, return the appropriate work queue operations in
*WORK_ITEMS.
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Apr 12 15:17:10 2011
@@ -10486,8 +10486,8 @@ has_local_mods(svn_boolean_t *is_modifie
node_kind = svn_sqlite__column_token(stmt, 1, kind_map);
if (node_kind == svn_wc__db_kind_file)
{
- SVN_ERR(svn_wc__internal_text_modified_p(is_modified, db,
- node_abspath,
+ SVN_ERR(svn_wc__internal_file_modified_p(is_modified, NULL,
+ NULL, db, node_abspath,
FALSE, TRUE, iterpool));
if (*is_modified)
break;
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1091453&r1=1091452&r2=1091453&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Apr 12 15:17:10 2011
@@ -787,12 +787,11 @@ log_do_committed(svn_wc__db_t *db,
/* Compare the texts. We just removed the translated size
and working time from the nodes record by calling
svn_wc__db_global_commit , so we can just use
- svn_wc__internal_text_modified_p's internal logic
+ svn_wc__internal_file_modified_p's internal logic
to determine if we should mark the file as unmodified */
- SVN_ERR(svn_wc__internal_text_modified_p(
- &modified, db, local_abspath,
- TRUE /* force_comparison */,
- FALSE /* compare_textbases */, pool));
+ SVN_ERR(svn_wc__internal_file_modified_p(&modified, NULL, NULL,
+ db, local_abspath,
+ TRUE, FALSE, pool));
/* If they are the same, use the working file's timestamp,
else use epoch. */