svn commit: r1403421 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c

[st...@apache.org]

Author: stsp
Date: Mon Oct 29 16:52:07 2012
New Revision: 1403421

URL: http://svn.apache.org/viewvc?rev=1403421&view=rev
Log:
Use a wc_db API in the move-update editor instead of directly using
an svn_sqlite API.

* subversion/libsvn_wc/wc_db_update_move.c
  (update_moved_away_conflict_victim): Make this an implementation of
   svn_wc__db_txn_callback_t instead of svn_sqlite__transaction_callback_t.
  (svn_wc__db_update_moved_away_conflict_victim): Call svn_wc__db_with_txn()
   instead of svn_sqlite__with_transaction().

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1403421&r1=1403420&r2=1403421&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Oct 29 16:52:07 2012
@@ -624,10 +624,11 @@ struct update_moved_away_conflict_victim
   apr_pool_t *result_pool;
 };
 
-/* An implementation of svn_sqlite__transaction_callback_t. */
+/* An implementation of svn_wc__db_txn_callback_t. */
 static svn_error_t *
 update_moved_away_conflict_victim(void *baton,
-                                  svn_sqlite__db_t *sdb,
+                                  svn_wc__db_wcroot_t *wcroot,
+                                  const char *victim_relpath,
                                   apr_pool_t *scratch_pool)
 {
   struct update_moved_away_conflict_victim_baton *b = baton;
@@ -714,9 +715,9 @@ svn_wc__db_update_moved_away_conflict_vi
   b.cancel_baton = cancel_baton;
   b.result_pool = result_pool;
 
-  SVN_ERR(svn_sqlite__with_transaction(wcroot->sdb,
-                                       update_moved_away_conflict_victim, &b,
-                                       scratch_pool));
+  SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath,
+                              update_moved_away_conflict_victim, &b,
+                              scratch_pool));
 
   return SVN_NO_ERROR;
 }