Checkout
Bert Huijben
committed
on 03 Jul 12
Replace all calls to svn_wc__db_read_conflicts() by a call to a new
svn_wc__read_conflicts() to allow switching more of the wc_db api to
con… Show more
Replace all calls to svn_wc__db_read_conflicts() by a call to a new

svn_wc__read_conflicts() to allow switching more of the wc_db api to

conflict skels in a future patch.

No functional changes, but removes some dead code.

* subversion/include/private/svn_wc_private.h

 (svn_wc__node_get_conflict_info): Remove unused function.

* subversion/libsvn_wc/adm_ops.c

 (svn_wc__delete_many,

  svn_wc__delete_internal): Update caller.

* subversion/libsvn_wc/conflicts.c

 (svn_wc__read_conflicts): New function.

 (resolve_conflict_on_node,

  conflict_status_walker): Update caller.

* subversion/libsvn_wc/copy.c

 (copy_versioned_file,

  remove_node_conflict_markers): Update caller.

* subversion/libsvn_wc/entries.c

 (read_one_entry): Update callers.

* subversion/libsvn_wc/info.c

 (build_info_for_node,

  svn_wc__get_info): Update callers.

* subversion/libsvn_wc/node.c

 (svn_wc__node_get_conflict_info): Remove function.

* subversion/libsvn_wc/props.c

 (svn_wc__get_prejfile_abspath): Remove function.

* subversion/libsvn_wc/questions.c

 (svn_wc__internal_conflicted_p): Update caller.

* subversion/libsvn_wc/tree_conflicts.c

 (svn_wc__get_tree_conflict): Update caller.

* subversion/libsvn_wc/wc.h

 (svn_wc__read_conflicts): New function.

* subversion/libsvn_wc/workqueue.c

 (run_set_text_conflict_markers,

  run_set_property_conflict_marker): Update callers.

Show less