Author: stsp
Date: Fri May 29 13:41:02 2015
New Revision: 1682464
URL: http://svn.apache.org/r1682464
Log:
Introduce a temporary client API which makes it possible to treat the
svn_wc_conflict_description2_t struct as an opaque type in 'svn'.
This transitional API is not meant to be released with 1.10.
* subversion/include/svn_client.h
(svn_client_conflict_get_local_abspath,
svn_client_conflict_get_node_kind,
svn_client_conflict_get_kind,
svn_client_conflict_get_property_name,
svn_client_conflict_get_is_binary,
svn_client_conflict_get_mime_type,
svn_client_conflict_get_action,
svn_client_conflict_get_reason,
svn_client_conflict_get_base_abspath,
svn_client_conflict_get_their_abspath,
svn_client_conflict_get_my_abspath,
svn_client_conflict_get_merged_file,
svn_client_conflict_get_operation,
svn_client_conflict_get_src_left_version,
svn_client_conflict_get_src_right_version,
svn_client_conflict_get_prop_reject_abspath,
svn_client_conflict_get_prop_value_working,
svn_client_conflict_get_prop_value_incoming_old,
svn_client_conflict_get_prop_value_incoming_new): New macros.
Modified:
subversion/trunk/subversion/include/svn_client.h
Modified: subversion/trunk/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1682464&r1=1682463&r2=1682464&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri May 29 13:41:02 2015
@@ -4356,6 +4356,78 @@ svn_client_revert(const apr_array_header
/** @} */
/**
+ * @defgroup Conflicts Dealing with conflicted paths.
+ *
+ * @{
+ */
+
+/**
+ * Accessor functions for svn_wc_conflict_description2_t. This is a temporary
+ * API for eventually replacing svn_wc_conflict_description2_t with an opaque
+ * type and providing improved APIs for conflict resolution.
+ *
+ * @since New in 1.10.
+ */
+#define svn_client_conflict_get_local_abspath(conflict) \
+ (conflict->local_abspath)
+
+#define svn_client_conflict_get_node_kind(conflict) \
+ (conflict->node_kind)
+
+#define svn_client_conflict_get_kind(conflict) \
+ (conflict->kind)
+
+#define svn_client_conflict_get_property_name(conflict) \
+ (conflict->property_name)
+
+#define svn_client_conflict_get_is_binary(conflict) \
+ (conflict->is_binary)
+
+#define svn_client_conflict_get_mime_type(conflict) \
+ (conflict->mime_type)
+
+#define svn_client_conflict_get_action(conflict) \
+ (conflict->action)
+
+#define svn_client_conflict_get_reason(conflict) \
+ (conflict->reason)
+
+#define svn_client_conflict_get_base_abspath(conflict) \
+ (conflict->base_abspath)
+
+#define svn_client_conflict_get_their_abspath(conflict) \
+ (conflict->their_abspath)
+
+#define svn_client_conflict_get_my_abspath(conflict) \
+ (conflict->my_abspath)
+
+#define svn_client_conflict_get_merged_file(conflict) \
+ (conflict->merged_file)
+
+#define svn_client_conflict_get_operation(conflict) \
+ (conflict->operation)
+
+#define svn_client_conflict_get_src_left_version(conflict) \
+ (conflict->src_left_version)
+
+#define svn_client_conflict_get_src_right_version(conflict) \
+ (conflict->src_right_version)
+
+#define svn_client_conflict_get_prop_reject_abspath(conflict) \
+ (conflict->prop_reject_abspath)
+
+#define svn_client_conflict_get_prop_value_working(conflict) \
+ (conflict->prop_value_working)
+
+#define svn_client_conflict_get_prop_value_incoming_old(conflict) \
+ (conflict->prop_value_incoming_old)
+
+#define svn_client_conflict_get_prop_value_incoming_new(conflict) \
+ (conflict->prop_value_incoming_new)
+
+/** @} */
+
+/**
* @defgroup Resolved Mark conflicted paths as resolved.
*
* @{
