svn commit: r1030558 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

[ph...@apache.org]

Author: philip
Date: Wed Nov  3 17:37:58 2010
New Revision: 1030558

URL: http://svn.apache.org/viewvc?rev=1030558&view=rev
Log:
Remove a function that has become a pointless wrapper.

* subversion/libsvn_wc/update_editor.c
  (prep_directory): Remove.
  (add_directory): Call svn_wc__ensure_directory directly, add comment
   about database problem.
  (close_file): Add comment about database problem.

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

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1030558&r1=1030557&r2=1030558&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Nov  3 17:37:58 2010
@@ -1091,29 +1091,6 @@ window_handler(svn_txdelta_window_t *win
 }
 
 
-/* Prepare directory for dir_baton DB for updating or checking out.
- * Give it depth DEPTH.
- *
- * If the path already exists, but is not a working copy for
- * ANCESTOR_URL and ANCESTOR_REVISION, then an error will be returned.
- */
-static svn_error_t *
-prep_directory(struct dir_baton *db,
-               const char *ancestor_url,
-               svn_revnum_t ancestor_revision,
-               apr_pool_t *pool)
-{
-  const char *dir_abspath;
-
-  dir_abspath = db->local_abspath;
-
-  /* Make sure the directory exists. */
-  SVN_ERR(svn_wc__ensure_directory(dir_abspath, pool));
-
-  return SVN_NO_ERROR;
-}
-
-
 /* Find the last-change info within ENTRY_PROPS, and return then in the
    CHANGED_* parameters. Each parameter will be initialized to its "none"
    value, and will contain the relavent info if found.
@@ -2473,17 +2450,12 @@ add_directory(const char *path,
                                                        db->ambient_depth,
                                                        pool));
 
-  SVN_ERR(prep_directory(db,
-                         svn_path_url_add_component2(eb->repos_root,
-                                                     db->new_relpath, pool),
-                         *(eb->target_revision),
-                         db->pool));
+  SVN_ERR(svn_wc__ensure_directory(db->local_abspath, pool));
 
   /* If PATH is within a locally deleted tree then make it also
-     scheduled for deletion.  We must do this after the call to
-     prep_directory() otherwise the administrative area for DB->PATH
-     is not present, nor is there an entry for DB->PATH in DB->PATH's
-     entries. */
+     scheduled for deletion.  We should do this at the same time as
+     setting the dir incomplete otherwise the db is temporarily
+     invalid. */
   if (pb->in_deleted_and_tree_conflicted_subtree)
     {
       SVN_ERR(svn_wc__db_temp_op_delete(eb->db, db->local_abspath, pool));
@@ -4556,7 +4528,8 @@ close_file(void *file_baton,
   /* Deal with the WORKING tree, based on updates to the BASE tree.  */
 
   /* An ancestor was locally-deleted. This file is being added within
-     that tree. We need to schedule this file for deletion.  */
+     that tree. We need to schedule this file for deletion.  This
+     should happen at the same time as svn_wc__db_base_add_file.  */
   if (fb->dir_baton->in_deleted_and_tree_conflicted_subtree && fb->adding_file)
     {
       SVN_ERR(svn_wc__db_temp_op_delete(eb->db, fb->local_abspath, pool));