You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/02/24 12:57:46 UTC
svn commit: r1732092 - in /subversion/trunk/subversion: include/svn_client.h
libsvn_client/conflicts.c svn/cl-conflicts.c svn/cl-conflicts.h
svn/conflict-callbacks.c
Author: stsp
Date: Wed Feb 24 11:57:46 2016
New Revision: 1732092
URL: http://svn.apache.org/viewvc?rev=1732092&view=rev
Log:
Remove 'const' from all svn_client_conflict_t.
We reserve the right to do anything to conflict objects under the hood,
anywhere. This type is opaque so callers shouldn't care about constness.
* subversion/include/svn_client.h,
subversion/libsvn_client/conflicts.c
(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_tree_get_resolution,
svn_client_conflict_prop_get_resolution,
svn_client_conflict_text_get_resolution): Drop 'const' from conflict.
* subversion/svn/cl-conflicts.h,
subversion/svn/cl-conflicts.c
(svn_cl__get_human_readable_prop_conflict_description,
svn_cl__get_human_readable_prop_conflict_description,
append_tree_conflict_info_xml): Drop 'const' from conflict.
* subversion/svn/conflict-callbacks.c
(show_diff, show_conflicts): Drop 'const' from conflict.
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/conflicts.c
subversion/trunk/subversion/svn/cl-conflicts.c
subversion/trunk/subversion/svn/cl-conflicts.h
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1732092&r1=1732091&r2=1732092&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Feb 24 11:57:46 2016
@@ -4600,7 +4600,7 @@ svn_client_conflict_option_describe(cons
* @since New in 1.10.
*/
const char *
-svn_client_conflict_get_local_abspath(const svn_client_conflict_t *conflict);
+svn_client_conflict_get_local_abspath(svn_client_conflict_t *conflict);
/**
* Return the operation during which the conflict described by @a
@@ -4609,7 +4609,7 @@ svn_client_conflict_get_local_abspath(co
* @since New in 1.10.
*/
svn_wc_operation_t
-svn_client_conflict_get_operation(const svn_client_conflict_t *conflict);
+svn_client_conflict_get_operation(svn_client_conflict_t *conflict);
/**
* Return the action an update, switch, or merge operation attempted to
@@ -4618,7 +4618,7 @@ svn_client_conflict_get_operation(const
* @since New in 1.10.
*/
svn_wc_conflict_action_t
-svn_client_conflict_get_incoming_change(const svn_client_conflict_t *conflict);
+svn_client_conflict_get_incoming_change(svn_client_conflict_t *conflict);
/**
* Return the reason why the attempted action performed by an update, switch,
@@ -4632,7 +4632,7 @@ svn_client_conflict_get_incoming_change(
* @since New in 1.10.
*/
svn_wc_conflict_reason_t
-svn_client_conflict_get_local_change(const svn_client_conflict_t *conflict);
+svn_client_conflict_get_local_change(svn_client_conflict_t *conflict);
/**
* Return information about the repository associated with @a conflict.
@@ -4644,7 +4644,7 @@ svn_client_conflict_get_local_change(con
svn_error_t *
svn_client_conflict_get_repos_info(const char **repos_root_url,
const char **repos_uuid,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -4679,7 +4679,7 @@ svn_client_conflict_get_incoming_old_rep
const char **incoming_old_repos_relpath,
svn_revnum_t *incoming_old_regrev,
svn_node_kind_t *incoming_old_node_kind,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -4751,7 +4751,7 @@ svn_client_conflict_tree_resolve_by_id(
* @since New in 1.10.
*/
svn_client_conflict_option_id_t
-svn_client_conflict_tree_get_resolution(const svn_client_conflict_t *conflict);
+svn_client_conflict_tree_get_resolution(svn_client_conflict_t *conflict);
/**
* Return the path to the legacy property conflicts reject file
@@ -4821,7 +4821,7 @@ svn_client_conflict_prop_resolve_by_id(
* @since New in 1.10.
*/
svn_client_conflict_option_id_t
-svn_client_conflict_prop_get_resolution(const svn_client_conflict_t *conflict,
+svn_client_conflict_prop_get_resolution(svn_client_conflict_t *conflict,
const char *propname);
/**
@@ -4883,7 +4883,7 @@ svn_client_conflict_text_resolve_by_id(
* @since New in 1.10.
*/
svn_client_conflict_option_id_t
-svn_client_conflict_text_get_resolution(const svn_client_conflict_t *conflict);
+svn_client_conflict_text_get_resolution(svn_client_conflict_t *conflict);
/** @} */
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1732092&r1=1732091&r2=1732092&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Feb 24 11:57:46 2016
@@ -1465,7 +1465,7 @@ svn_client_conflict_text_resolve_by_id(
}
svn_client_conflict_option_id_t
-svn_client_conflict_text_get_resolution(const svn_client_conflict_t *conflict)
+svn_client_conflict_text_get_resolution(svn_client_conflict_t *conflict)
{
return conflict->resolution_text;
}
@@ -1513,7 +1513,7 @@ svn_client_conflict_prop_resolve_by_id(
}
svn_client_conflict_option_id_t
-svn_client_conflict_prop_get_resolution(const svn_client_conflict_t *conflict,
+svn_client_conflict_prop_get_resolution(svn_client_conflict_t *conflict,
const char *propname)
{
svn_client_conflict_option_t *option;
@@ -1609,14 +1609,14 @@ svn_client_conflict_tree_resolve_by_id(
}
svn_client_conflict_option_id_t
-svn_client_conflict_tree_get_resolution(const svn_client_conflict_t *conflict)
+svn_client_conflict_tree_get_resolution(svn_client_conflict_t *conflict)
{
return conflict->resolution_tree;
}
/* Return the legacy conflict descriptor which is wrapped by CONFLICT. */
static const svn_wc_conflict_description2_t *
-get_conflict_desc2_t(const svn_client_conflict_t *conflict)
+get_conflict_desc2_t(svn_client_conflict_t *conflict)
{
if (conflict->legacy_text_conflict)
return conflict->legacy_text_conflict;
@@ -1659,25 +1659,25 @@ svn_client_conflict_get_conflicted(svn_b
}
const char *
-svn_client_conflict_get_local_abspath(const svn_client_conflict_t *conflict)
+svn_client_conflict_get_local_abspath(svn_client_conflict_t *conflict)
{
return conflict->local_abspath;
}
svn_wc_operation_t
-svn_client_conflict_get_operation(const svn_client_conflict_t *conflict)
+svn_client_conflict_get_operation(svn_client_conflict_t *conflict)
{
return get_conflict_desc2_t(conflict)->operation;
}
svn_wc_conflict_action_t
-svn_client_conflict_get_incoming_change(const svn_client_conflict_t *conflict)
+svn_client_conflict_get_incoming_change(svn_client_conflict_t *conflict)
{
return get_conflict_desc2_t(conflict)->action;
}
svn_wc_conflict_reason_t
-svn_client_conflict_get_local_change(const svn_client_conflict_t *conflict)
+svn_client_conflict_get_local_change(svn_client_conflict_t *conflict)
{
return get_conflict_desc2_t(conflict)->reason;
}
@@ -1685,7 +1685,7 @@ svn_client_conflict_get_local_change(con
svn_error_t *
svn_client_conflict_get_repos_info(const char **repos_root_url,
const char **repos_uuid,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1721,7 +1721,7 @@ svn_client_conflict_get_incoming_old_rep
const char **incoming_old_repos_relpath,
svn_revnum_t *incoming_old_pegrev,
svn_node_kind_t *incoming_old_node_kind,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
Modified: subversion/trunk/subversion/svn/cl-conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl-conflicts.c?rev=1732092&r1=1732091&r2=1732092&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl-conflicts.c (original)
+++ subversion/trunk/subversion/svn/cl-conflicts.c Wed Feb 24 11:57:46 2016
@@ -221,7 +221,7 @@ operation_str(svn_wc_operation_t operati
svn_error_t *
svn_cl__get_human_readable_prop_conflict_description(
const char **desc,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *pool)
{
const char *reason_str, *action_str;
@@ -280,7 +280,7 @@ svn_cl__get_human_readable_prop_conflict
svn_error_t *
svn_cl__get_human_readable_tree_conflict_description(
const char **desc,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *pool)
{
const char *action, *reason, *operation;
@@ -403,7 +403,7 @@ add_conflict_version_xml(svn_stringbuf_t
static svn_error_t *
append_tree_conflict_info_xml(svn_stringbuf_t *str,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *pool)
{
apr_hash_t *att_hash = apr_hash_make(pool);
Modified: subversion/trunk/subversion/svn/cl-conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl-conflicts.h?rev=1732092&r1=1732091&r2=1732092&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl-conflicts.h (original)
+++ subversion/trunk/subversion/svn/cl-conflicts.h Wed Feb 24 11:57:46 2016
@@ -49,7 +49,7 @@ extern "C" {
svn_error_t *
svn_cl__get_human_readable_prop_conflict_description(
const char **desc,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *pool);
/**
@@ -61,7 +61,7 @@ svn_cl__get_human_readable_prop_conflict
svn_error_t *
svn_cl__get_human_readable_tree_conflict_description(
const char **desc,
- const svn_client_conflict_t *conflict,
+ svn_client_conflict_t *conflict,
apr_pool_t *pool);
/* Like svn_cl__get_human_readable_tree_conflict_description but
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1732092&r1=1732091&r2=1732092&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Feb 24 11:57:46 2016
@@ -86,7 +86,7 @@ svn_cl__accept_from_word(const char *wor
/* Print on stdout a diff that shows incoming conflicting changes
* corresponding to the conflict described in CONFLICT. */
static svn_error_t *
-show_diff(const svn_client_conflict_t *conflict,
+show_diff(svn_client_conflict_t *conflict,
const char *merged_abspath,
const char *path_prefix,
svn_cancel_func_t cancel_func,
@@ -168,7 +168,7 @@ show_diff(const svn_client_conflict_t *c
/* Print on stdout just the conflict hunks of a diff among the 'base', 'their'
* and 'my' files of CONFLICT. */
static svn_error_t *
-show_conflicts(const svn_client_conflict_t *conflict,
+show_conflicts(svn_client_conflict_t *conflict,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool)