svn commit: r1097250 - in /subversion/trunk/subversion/svn: cl.h status.c util.c

[hw...@apache.org]

Author: hwright
Date: Wed Apr 27 21:32:42 2011
New Revision: 1097250

URL: http://svn.apache.org/viewvc?rev=1097250&view=rev
Log:
Remove the conflict description converter introduced in r1097203 to the
command line client.  It is now unneeded.

* subversion/svn/cl.h
  (svn_cl__cd_to_cd2): Remove.

* subversion/svn/util.c
  (svn_cl__cd_to_cd2): Remove.

* subversion/svn/status.c
  (print_status): Don't double-convert the incoming conflict.

Modified:
    subversion/trunk/subversion/svn/cl.h
    subversion/trunk/subversion/svn/status.c
    subversion/trunk/subversion/svn/util.c

Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1097250&r1=1097249&r2=1097250&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Wed Apr 27 21:32:42 2011
@@ -809,11 +809,6 @@ svn_cl__opt_parse_path(svn_opt_revision_
 svn_error_t *
 svn_cl__assert_homogeneous_target_type(const apr_array_header_t *targets);
 
-/* Temp function for updating output functions. */
-svn_wc_conflict_description2_t *
-svn_cl__cd_to_cd2(const svn_wc_conflict_description_t *conflict,
-                 apr_pool_t *result_pool);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1097250&r1=1097249&r2=1097250&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Wed Apr 27 21:32:42 2011
@@ -171,17 +171,13 @@ print_status(const char *path,
       if (tree_conflicted)
         {
           const svn_wc_conflict_description2_t *tree_conflict;
-          svn_wc_conflict_description_t *old_tree_conflict;
           SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx,
                                             local_abspath, pool, pool));
           SVN_ERR_ASSERT(tree_conflict != NULL);
-          old_tree_conflict = svn_wc__cd2_to_cd(tree_conflict, pool);
 
           tree_status_code = 'C';
           SVN_ERR(svn_cl__get_human_readable_tree_conflict_description(
-                            &desc,
-                            svn_cl__cd_to_cd2(old_tree_conflict, pool),
-                            pool));
+                            &desc, tree_conflict, pool));
           tree_desc_line = apr_psprintf(pool, "\n      >   %s", desc);
           (*tree_conflicts)++;
         }

Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=1097250&r1=1097249&r2=1097250&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Wed Apr 27 21:32:42 2011
@@ -1352,60 +1352,3 @@ svn_cl__assert_homogeneous_target_type(c
                                "targets"));
   return err;
 }
-
-svn_wc_conflict_description2_t *
-svn_cl__cd_to_cd2(const svn_wc_conflict_description_t *conflict,
-                 apr_pool_t *result_pool)
-{
-  svn_wc_conflict_description2_t *new_conflict;
-
-  if (conflict == NULL)
-    return NULL;
-
-  new_conflict = apr_pcalloc(result_pool, sizeof(*new_conflict));
-
-  svn_error_clear(
-    svn_dirent_get_absolute(&new_conflict->local_abspath, conflict->path,
-                            result_pool));
-  new_conflict->node_kind = conflict->node_kind;
-  new_conflict->kind = conflict->kind;
-  new_conflict->action = conflict->action;
-  new_conflict->reason = conflict->reason;
-  if (conflict->src_left_version)
-    new_conflict->src_left_version =
-          svn_wc_conflict_version_dup(conflict->src_left_version, result_pool);
-  if (conflict->src_right_version)
-    new_conflict->src_right_version =
-          svn_wc_conflict_version_dup(conflict->src_right_version, result_pool);
-
-  switch (conflict->kind)
-    {
-      case svn_wc_conflict_kind_property:
-        new_conflict->property_name = apr_pstrdup(result_pool,
-                                                  conflict->property_name);
-        /* Falling through. */
-
-      case svn_wc_conflict_kind_text:
-        new_conflict->is_binary = conflict->is_binary;
-        new_conflict->mime_type = conflict->mime_type
-                              ? apr_pstrdup(result_pool, conflict->mime_type)
-                              : NULL;
-        new_conflict->base_abspath = apr_pstrdup(result_pool,
-                                                 conflict->base_file);
-        new_conflict->their_abspath = apr_pstrdup(result_pool,
-                                                  conflict->their_file);
-        new_conflict->my_abspath = apr_pstrdup(result_pool,
-                                               conflict->my_file);
-        new_conflict->merged_file = conflict->merged_file
-                                    ? apr_pstrdup(result_pool,
-                                                  conflict->merged_file)
-                                    : NULL;
-        break;
-
-      case svn_wc_conflict_kind_tree:
-        new_conflict->operation = conflict->operation;
-        break;
-    }
-
-  return new_conflict;
-}