Checkout
stsp
committed
on 25 Jun 15
Introduce svn_client_conflict_t and start making use of it in the resolver.

Right now, this new opaque type simply wraps the old struct. Th… Show more
Introduce svn_client_conflict_t and start making use of it in the resolver.

Right now, this new opaque type simply wraps the old struct. This is required

to keep the current resolver implementation working for now.

The plan is to develop new resolver functionality using the new type and

eventually phase out the old struct entirely.

* subversion/include/svn_client.h

 (svn_client_conflict_t, svn_client_conflict_get,

  svn_client_conflict_from_wc_description2_t): Declare.

 (svn_client_conflict_get_kind,

  svn_client_conflict_get_local_abspath,

  svn_client_conflict_get_operation,

  svn_client_conflict_get_incoming_change,

  svn_client_conflict_get_local_change,

  svn_client_conflict_get_repos_info,

  svn_client_conflict_get_incoming_old_repos_location,

  svn_client_conflict_get_incoming_new_repos_location,

  svn_client_conflict_tree_get_victim_node_kind,

  svn_client_conflict_prop_get_propname,

  svn_client_conflict_text_get_mime_type,

  svn_client_conflict_text_get_contents): Expect svn_client_conflict_t.

* subversion/libsvn_client/resolved.c

 (svn_client_conflict_t, svn_client_conflict_get,

  svn_client_conflict_from_wc_description2_t): Implement.

 (svn_client_conflict_get_kind,

  svn_client_conflict_get_local_abspath,

  svn_client_conflict_get_operation,

  svn_client_conflict_get_incoming_change,

  svn_client_conflict_get_local_change,

  svn_client_conflict_get_repos_info,

  svn_client_conflict_get_incoming_old_repos_location,

  svn_client_conflict_get_incoming_new_repos_location,

  svn_client_conflict_tree_get_victim_node_kind,

  svn_client_conflict_prop_get_propname,

  svn_client_conflict_text_get_mime_type,

  svn_client_conflict_text_get_contents): Use svn_client_conflict_t.

* subversion/svn/cl-conflicts.h

 (svn_cl__get_human_readable_prop_conflict_description,

  svn_cl__get_human_readable_tree_conflict_description,

  svn_cl__append_conflict_info_xml): Expect svn_client_conflict_t.

* subversion/svn/cl-conflicts.c

 (svn_cl__get_human_readable_prop_conflict_description,

  svn_cl__get_human_readable_tree_conflict_description,

  append_tree_conflict_info_xml,

  svn_cl__append_conflict_info_xml): Expect svn_client_conflict_t.

* subversion/svn/conflict-callbacks.c

 (show_diff, show_conflicts, handle_text_conflict, handle_prop_conflict,

  handle_tree_conflict, conflict_func_interactive): Use svn_client_conflict_t.

(svn_cl__conflict_func_interactive): Convert svn_wc_conflict_description2_t

 to svn_client_conflict_t and use that.

* subversion/svn/info-cmd.c

 (print_info_xml, print_info): Convert svn_wc_conflict_description2_t to

 svn_client_conflict_t and use that.

  

* subversion/svn/status.c

 (print_status): Convert svn_wc_conflict_description2_t to

  svn_client_conflict_t and use that.

Show less