You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/10/08 16:58:50 UTC
svn commit: r1005853 - in /subversion/trunk/subversion: include/svn_wc.h
libsvn_wc/conflicts.c
Author: rhuijben
Date: Fri Oct 8 14:58:49 2010
New Revision: 1005853
URL: http://svn.apache.org/viewvc?rev=1005853&view=rev
Log:
Remove a temporary/prototype/RFC public conflict api that I added about a
year ago as it will most likely never be implemented like this. This api is
superseded by the skel definition we are working on in
^/subversion/trunk/notes/wc-ng/conflict-storage
* subversion/include/svn_wc.h
(svn_wc_conflict_t): Remove typedef.
(svn_wc_conflict_dup): Remove function.
(svn_wc_get_conflict_info): Remove function.
(svn_wc_get_conflict_marker_files): Remove function.
(svn_wc_get_conflict_sources): Remove function.
(svn_wc_get_property_conflict_data): Remove function.
(svn_wc_create_property_conflict): Remove function.
(svn_wc_create_text_conflict): Remove function.
(svn_wc_create_tree_conflict): Remove function.
* subversion/libsvn_wc/conflicts.c
(svn_wc_conflict_t): Remove struct.
(conflict_alloc): Remove function.
(svn_wc_conflict_dup): Remove function.
(svn_wc_create_property_conflict): Remove function.
(svn_wc_create_text_conflict): Remove function.
(svn_wc_create_tree_conflict): Remove function.
(svn_wc_get_conflict_info): Remove function.
(svn_wc_get_conflict_marker_files): Remove function.
(svn_wc_get_conflict_sources): Remove function.
(svn_wc_get_property_conflict_data): Remove function.
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1005853&r1=1005852&r2=1005853&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Fri Oct 8 14:58:49 2010
@@ -1558,199 +1558,6 @@ svn_wc_conflict_version_t *
svn_wc_conflict_version_dup(const svn_wc_conflict_version_t *version,
apr_pool_t *pool);
-
-/** An opaque structure that describes a conflict that has occurred on a
- * specific target in a working copy. Passed to the conflict helper
- * functions and to #svn_wc_conflict_resolver_func2_t when performing
- * interactive conflict resolving.
- *
- * @since New in 1.7.
- */
- /* ### We use svn_wc_conflict_t as non constant to allow delayloading
- values. */
-typedef struct svn_wc_conflict_t svn_wc_conflict_t;
-
-/** Duplicates a @a base conflict, to a @a duplicate conflict, allocated
- * in @a result_pool.
- *
- * @since New in 1.7.
- */
-svn_error_t *
-svn_wc_conflict_dup(svn_wc_conflict_t **duplicate,
- const svn_wc_conflict_t *base,
- apr_pool_t *result_pool);
-
-/** Read information about @a conflict, as it applies to @a local_abspath
- * in @a wc_ctx.
- *
- * If @a kind is not NULL, retrieves the kind of conflict.
- *
- * If @a property_name is not NULL, retrieves the name of the property
- * where this conflict applies to. @a property_name is NULL, when this
- * information is not available. (This information is not always recorded).
- *
- * If @a action is not NULL, retrieves the action that raised the conflict
- * or #svn_wc_conflict_action_edit if no action was recorded.
- *
- * If @a reason is not NULL, retrieves the reason why the conflict was
- * raised or #svn_wc_conflict_reason_t if no reason was recorded.
- *
- * If @a operation is not NULL, retrieves the operation that was performed
- * when the conflict was raised or #svn_wc_operation_none if no operation
- * was recorded.
- *
- * If @a conflict_resolved is not NULL, conflict type specific checks are
- * performed to see if this conflict is resolved. (E.g. for file and property
- * conflicts the marker and rejection files are tested for availablity).
- * If the conflict is resolved sets @a *conflict_resolved to TRUE, otherwise
- * to FALSE.
- *
- * @since New in 1.7.
- */
-/* ### Separate in more methods like the WC-1.0 api, or add more
- to remove other apis, like we do in WC-NG? */
-svn_error_t *
-svn_wc_get_conflict_info(svn_wc_conflict_kind_t *kind,
- const char **property_name,
- svn_wc_conflict_action_t *action,
- svn_wc_conflict_reason_t *reason,
- svn_wc_operation_t *operation,
- svn_boolean_t *conflict_resolved,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/** Retrieves the conflict marker file locations recorded in @a conflict,
- * as it applies to @a local_abspath in @a wc_ctx.
- *
- * For text and property conflicts older is the BASE version, left the MINE
- * version and right the THEIRS version. Depending on the type of conflict,
- * some or all of these values might be NULL.
- *
- * @since New in 1.7.
- */
-svn_error_t *
-svn_wc_get_conflict_marker_files(const char **older_abspath,
- const char **left_abspath,
- const char **right_abspath,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/** Retrieves the origin of the conflict recorded in @a conflict, as it
- * applies to @a local_abspath in @a wc_ctx.
- *
- * For text and property conflicts older is the BASE version, left the MINE
- * version and right the THEIRS version. Depending on the type of conflict,
- * some or all of these values might be NULL.
- *
- * @since New in 1.7.
- */
-svn_error_t *
-svn_wc_get_conflict_sources(const svn_wc_conflict_version_t **older_version,
- const svn_wc_conflict_version_t **left_version,
- const svn_wc_conflict_version_t **right_version,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/** Retrieves the values of the conflicted property recorded in @a
- * conflict, as it applies to @a local_abspath in @a wc_ctx.
- *
- * If @a older_value, @a left_value and/or @a right_value are not NULL,
- * retrieves this property value as recorded in the conflict data. A
- * returned NULL indicates that the property was not available in that
- * version. (If #svn_wc_get_conflict_info doesn't provide a property
- * name, no property data was recorded in the property conflict)
- *
- * For property conflicts older is the BASE version, left the MINE
- * version and right the THEIRS version.
- *
- * @since New in 1.7.
- */
-svn_error_t *
-svn_wc_get_property_conflict_data(const svn_string_t **older_value,
- const svn_string_t **left_value,
- const svn_string_t **right_value,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/** Creates a new property conflict, recording the passed values.
- *
- * @a property_name must be set to the conflicted property name or ""
- * if no property name is available. (Older api compatibility)
- *
- * @a older_version, @a left_version and @a right_version can be
- * NULL for compatibility with older apis.
- *
- * Iif @a property_name is not "", @a older_value, @a left_value and
- * @a right_value must be set to the values of property in these versions.
- * (which could be NULL if the property does not exist there).
- *
- * @since New in 1.7.
- */
-svn_error_t *
-svn_wc_create_property_conflict(svn_wc_conflict_t **conflict,
- const char *property_name,
- const svn_wc_conflict_version_t *older_version,
- const svn_wc_conflict_version_t *left_version,
- const svn_wc_conflict_version_t *right_version,
- const svn_string_t *older_value,
- const svn_string_t *left_value,
- const svn_string_t *right_value,
- const char *marker_abspath,
- svn_wc_operation_t operation,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/** Creates a new text conflict, recording the passed values.
- *
- * @a older_version, @a left_version and @a right_version can be NULL,
- * for compatibility with older apis.
- *
- * @a older_abspath, @a left_abspath and @a right_abspath can be NULL,
- * @a indicating that the file did not exist in that version.
- *
- * @since New in 1.7.
- */
-svn_error_t *
-svn_wc_create_text_conflict(svn_wc_conflict_t **conflict,
- const svn_wc_conflict_version_t *older_version,
- const svn_wc_conflict_version_t *left_version,
- const svn_wc_conflict_version_t *right_version,
- const char *older_abspath,
- const char *left_abspath,
- const char *right_abspath,
- svn_wc_operation_t operation,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
-/** Creates a new tree conflict @a conflict, recording the passed values.
- * All values except @a older_version must be non-NULL. @a older_version
- * can be NULL for backwards compatibility with older apis.
- *
- * @since New in 1.7.
- */
-svn_error_t *
-svn_wc_create_tree_conflict(svn_wc_conflict_t **conflict,
- const svn_wc_conflict_version_t *older_version,
- const svn_wc_conflict_version_t *left_version,
- const svn_wc_conflict_version_t *right_version,
- svn_wc_conflict_action_t action,
- svn_wc_conflict_reason_t reason,
- svn_wc_operation_t operation,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/** A struct that describes a conflict that has occurred in the
* working copy.
*
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1005853&r1=1005852&r2=1005853&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Oct 8 14:58:49 2010
@@ -50,152 +50,6 @@
#include "svn_private_config.h"
-struct svn_wc_conflict_t
-{
- /* ### kind + property name are the primary keys of a conflict */
- /* The kind of conflict recorded */
- svn_wc_conflict_kind_t kind;
-
- /* When describing a property conflict the property name
- or "" when no property name is available. (Upgrade from old WC or
- raised via compatibility apis). */
- const char *property_name;
-
- /* ### TODO: Add more fields */
-};
-
-/* */
-static svn_error_t *
-conflict_alloc(svn_wc_conflict_t **conflict, apr_pool_t *result_pool)
-{
- svn_wc_conflict_t *c = apr_pcalloc(result_pool, sizeof(*c));
-
- *conflict = c;
-
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_wc_conflict_dup(svn_wc_conflict_t **duplicate,
- const svn_wc_conflict_t *base,
- apr_pool_t *result_pool)
-{
- svn_wc_conflict_t *c;
-
- SVN_ERR(conflict_alloc(&c, result_pool));
-
- c->kind = base->kind;
- c->property_name = base->property_name
- ? apr_pstrdup(result_pool, base->property_name)
- : NULL;
-
- *duplicate = c;
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_wc_create_property_conflict(svn_wc_conflict_t **conflict,
- const char *property_name,
- const svn_wc_conflict_version_t *older_version,
- const svn_wc_conflict_version_t *left_version,
- const svn_wc_conflict_version_t *right_version,
- const svn_string_t *older_value,
- const svn_string_t *left_value,
- const svn_string_t *right_value,
- const char *marker_abspath,
- svn_wc_operation_t operation,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_MALFUNCTION(); /* ### Not implemented yet */
-}
-
-svn_error_t *
-svn_wc_create_text_conflict(svn_wc_conflict_t **conflict,
- const svn_wc_conflict_version_t *older_version,
- const svn_wc_conflict_version_t *left_version,
- const svn_wc_conflict_version_t *right_version,
- const char *older_abspath,
- const char *left_abspath,
- const char *right_abspath,
- svn_wc_operation_t operation,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_MALFUNCTION(); /* ### Not implemented yet */
-}
-
-svn_error_t *
-svn_wc_create_tree_conflict(svn_wc_conflict_t **conflict,
- const svn_wc_conflict_version_t *older_version,
- const svn_wc_conflict_version_t *left_version,
- const svn_wc_conflict_version_t *right_version,
- svn_wc_conflict_action_t action,
- svn_wc_conflict_reason_t reason,
- svn_wc_operation_t operation,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_MALFUNCTION(); /* ### Not implemented yet */
-}
-
-svn_error_t *
-svn_wc_get_conflict_info(svn_wc_conflict_kind_t *kind,
- const char **property_name,
- svn_wc_conflict_action_t *action,
- svn_wc_conflict_reason_t *reason,
- svn_wc_operation_t *operation,
- svn_boolean_t *conflict_resolved,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_MALFUNCTION(); /* ### Not implemented yet */
-}
-
-
-svn_error_t *
-svn_wc_get_conflict_marker_files(const char **older_abspath,
- const char **left_abspath,
- const char **right_abspath,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_MALFUNCTION(); /* ### Not implemented yet */
-}
-
-svn_error_t *
-svn_wc_get_conflict_sources(const svn_wc_conflict_version_t **older_version,
- const svn_wc_conflict_version_t **left_version,
- const svn_wc_conflict_version_t **right_version,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_MALFUNCTION(); /* ### Not implemented yet */
-}
-
-svn_error_t *
-svn_wc_get_property_conflict_data(const svn_string_t **older_value,
- const svn_string_t **left_value,
- const svn_string_t **right_value,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_wc_conflict_t *conflict,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- SVN_ERR_MALFUNCTION(); /* ### Not implemented yet */
-}
-
-
svn_skel_t *
svn_wc__conflict_skel_new(apr_pool_t *result_pool)
{