subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1357929 - in /subversion/trunk/subversion/libsvn_wc: update_editor.c wc_db.c wc_db.h
Date Thu, 05 Jul 2012 21:17:11 GMT
Author: rhuijben
Date: Thu Jul  5 21:17:10 2012
New Revision: 1357929

URL: http://svn.apache.org/viewvc?rev=1357929&view=rev
Log:
Turn svn_wc__db_temp_op_set_new_dir_to_incomplete into a real wc_db
operation svn_wc__db_op_begin_update. We can't ignore that this database
operation is essential for the current update editor.

Add conflict and work_items argument and use this to avoid additional
db operations.

* subversion/libsvn_wc/update_editor.c
  (add_directory): Update caller. Pass conflict skel.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_temp_op_set_new_dir_to_incomplete): Rename to ...
  (svn_wc__db_op_begin_update): ... this and copy new arguments in baton.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_temp_op_set_new_dir_to_incomplete): Rename to ...
  (svn_wc__db_op_begin_update): ... this.

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

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1357929&r1=1357928&r2=1357929&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Jul  5 21:17:10 2012
@@ -2231,14 +2231,14 @@ add_directory(const char *path,
         }
     }
 
-  SVN_ERR(svn_wc__db_temp_op_set_new_dir_to_incomplete(eb->db,
-                                                       db->local_abspath,
-                                                       db->new_relpath,
-                                                       eb->repos_root,
-                                                       eb->repos_uuid,
-                                                       *eb->target_revision,
-                                                       db->ambient_depth,
-                                                       pool));
+  SVN_ERR(svn_wc__db_op_begin_update(eb->db, db->local_abspath,
+                                     db->new_relpath,
+                                     eb->repos_root,
+                                     eb->repos_uuid,
+                                     *eb->target_revision,
+                                     db->ambient_depth,
+                                     tree_conflict, NULL,
+                                     pool));
 
   /* Make sure there is a real directory at LOCAL_ABSPATH, unless we are just
      updating the DB or the parent was moved away. */
@@ -2262,12 +2262,7 @@ add_directory(const char *path,
 
   if (tree_conflict != NULL)
     {
-      SVN_ERR(svn_wc__db_op_mark_conflict(eb->db, db->local_abspath,
-                                          tree_conflict, NULL,
-                                          db->pool));
-
       db->already_notified = TRUE;
-
       do_notification(eb, db->local_abspath, svn_node_dir,
                       svn_wc_notify_tree_conflict, pool);
     }

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1357929&r1=1357928&r2=1357929&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jul  5 21:17:10 2012
@@ -13008,14 +13008,16 @@ svn_wc__db_temp_op_make_copy(svn_wc__db_
 }
 
 svn_error_t *
-svn_wc__db_temp_op_set_new_dir_to_incomplete(svn_wc__db_t *db,
-                                             const char *local_abspath,
-                                             const char *repos_relpath,
-                                             const char *repos_root_url,
-                                             const char *repos_uuid,
-                                             svn_revnum_t revision,
-                                             svn_depth_t depth,
-                                             apr_pool_t *scratch_pool)
+svn_wc__db_op_begin_update(svn_wc__db_t *db,
+                           const char *local_abspath,
+                           const char *repos_relpath,
+                           const char *repos_root_url,
+                           const char *repos_uuid,
+                           svn_revnum_t revision,
+                           svn_depth_t depth,
+                           svn_skel_t *conflict,
+                           svn_skel_t *work_items,
+                           apr_pool_t *scratch_pool)
 {
   svn_wc__db_wcroot_t *wcroot;
   const char *local_relpath;
@@ -13042,6 +13044,8 @@ svn_wc__db_temp_op_set_new_dir_to_incomp
   ibb.repos_relpath = repos_relpath;
   ibb.revision = revision;
   ibb.depth = depth;
+  ibb.conflict = conflict;
+  ibb.work_items = work_items;
 
   SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath,
                               insert_base_node,

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1357929&r1=1357928&r2=1357929&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Thu Jul  5 21:17:10 2012
@@ -2923,14 +2923,16 @@ svn_wc__db_temp_op_make_copy(svn_wc__db_
    Perform all temporary allocations in SCRATCH_POOL.
    */
 svn_error_t *
-svn_wc__db_temp_op_set_new_dir_to_incomplete(svn_wc__db_t *db,
-                                             const char *local_abspath,
-                                             const char *repos_relpath,
-                                             const char *repos_root_url,
-                                             const char *repos_uuid,
-                                             svn_revnum_t revision,
-                                             svn_depth_t depth,
-                                             apr_pool_t *scratch_pool);
+svn_wc__db_op_begin_update(svn_wc__db_t *db,
+                           const char *local_abspath,
+                           const char *repos_relpath,
+                           const char *repos_root_url,
+                           const char *repos_uuid,
+                           svn_revnum_t revision,
+                           svn_depth_t depth,
+                           svn_skel_t *conflict,
+                           svn_skel_t *work_items,
+                           apr_pool_t *scratch_pool);
 
 /* Close the wc root LOCAL_ABSPATH and remove any per-directory
    handles associated with it. */



Mime
View raw message