Author: stsp
Date: Fri Oct 26 08:51:04 2012
New Revision: 1402432
URL: http://svn.apache.org/viewvc?rev=1402432&view=rev
Log:
Move the tree-conflict editor inside of wc_db. No functional change.
The plan is to make the entire edit atomic, as well as edit nodes which
possibly exist at some intermediate op-depth layer. This is easier to
do within the scope of wc_db.
* subversion/libsvn_wc/conflicts.c
(conflict_status_walker): Track function rename.
* subversion/libsvn_wc/conflicts.h
(svn_wc__update_moved_away_conflict_victim): Move declaration to...
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_update_moved_away_conflict_victim): ... this file and rename
function as appropriate for wc_db API.
* subversion/libsvn_wc/tree_conflict_editor.c: Rename to ...
* subversion/libsvn_wc/wc_db_update_move.c: ... this new name, tweak this
file's comment header accordingly, and rename the function
svn_wc__update_moved_away_conflict_victim() to
svn_wc__db_update_moved_away_conflict_victim().
Added:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
- copied, changed from r1402157,
subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
Removed:
subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/conflicts.h
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1402432&r1=1402431&r2=1402432&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Oct 26 08:51:04 2012
@@ -2647,7 +2647,7 @@ conflict_status_walker(void *baton,
cd->reason == svn_wc_conflict_reason_moved_away)
{
if (my_choice == svn_wc_conflict_choose_mine_conflict)
- SVN_ERR(svn_wc__update_moved_away_conflict_victim(
+ SVN_ERR(svn_wc__db_update_moved_away_conflict_victim(
&work_items, local_abspath, cswb->db,
cswb->notify_func, cswb->notify_baton,
cswb->cancel_func, cswb->cancel_baton,
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1402432&r1=1402431&r2=1402432&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Fri Oct 26 08:51:04 2012
@@ -394,21 +394,6 @@ svn_wc__resolve_text_conflict(svn_wc__db
const char *local_abspath,
apr_pool_t *scratch_pool);
-/* Update a moved-away tree conflict victim at VICTIM_ABSPATH with changes
- * brought in by the update operation which flagged the tree conflict.
- * Set *WORK_ITEMS to a list of work items, allocated in RESULT_POOL, that
- * need to run as part of marking the conflict resolved. */
-svn_error_t *
-svn_wc__update_moved_away_conflict_victim(svn_skel_t **work_items,
- const char *victim_abspath,
- svn_wc__db_t *db,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1402432&r1=1402431&r2=1402432&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri Oct 26 08:51:04 2012
@@ -3181,6 +3181,21 @@ svn_wc__db_follow_moved_to(apr_array_hea
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
+/* Update a moved-away tree conflict victim at VICTIM_ABSPATH with changes
+ * brought in by the update operation which flagged the tree conflict.
+ * Set *WORK_ITEMS to a list of work items, allocated in RESULT_POOL, that
+ * need to run as part of marking the conflict resolved. */
+svn_error_t *
+svn_wc__db_update_moved_away_conflict_victim(svn_skel_t **work_items,
+ const char *victim_abspath,
+ svn_wc__db_t *db,
+ svn_wc_notify_func2_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
/* @} */
Copied: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (from
r1402157, subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?p2=subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c&p1=subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c&r1=1402157&r2=1402432&rev=1402432&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Oct 26
08:51:04 2012
@@ -1,5 +1,5 @@
/*
- * tree_conflict_editor.c : editing trees during tree-conflict resolution
+ * wc_db_update_move.c : updating moves during tree-conflict resolution
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -612,15 +612,15 @@ drive_tree_conflict_editor(svn_editor_t
}
svn_error_t *
-svn_wc__update_moved_away_conflict_victim(svn_skel_t **work_items,
- const char *victim_abspath,
- svn_wc__db_t *db,
- svn_wc_notify_func2_t notify_func,
- void *notify_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_wc__db_update_moved_away_conflict_victim(svn_skel_t **work_items,
+ const char *victim_abspath,
+ svn_wc__db_t *db,
+ svn_wc_notify_func2_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_editor_t *tc_editor;
struct tc_editor_baton *b;
