subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1687243 - in /subversion/trunk/subversion: include/svn_client.h svn/conflict-callbacks.c
Date Wed, 24 Jun 2015 12:01:29 GMT
Author: stsp
Date: Wed Jun 24 12:01:29 2015
New Revision: 1687243

URL: http://svn.apache.org/r1687243
Log:
Remove svn_client_conflict_get_is_binary(). Conflict resolvers can
simply run svn_mime_type_is_binary() on the mime-type themselves.

* subversion/include/svn_client.h
  (svn_client_conflict_get_is_binary): Remove.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Use svn_mime_type_is_binary() directly.

Modified:
    subversion/trunk/subversion/include/svn_client.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=1687243&r1=1687242&r2=1687243&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Jun 24 12:01:29 2015
@@ -4460,9 +4460,6 @@ svn_client_conflict_prop_get_propvals(
  * @since New in 1.10. 
  */
 
-#define svn_client_conflict_get_is_binary(conflict) \
-  ((conflict)->is_binary)
-
 #define svn_client_conflict_get_mime_type(conflict) \
   ((conflict)->mime_type)
 

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1687243&r1=1687242&r2=1687243&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Jun 24 12:01:29 2015
@@ -726,7 +726,8 @@ handle_text_conflict(svn_wc_conflict_res
   svn_boolean_t knows_something = FALSE;
   const char *local_relpath;
   const char *local_abspath = svn_client_conflict_get_local_abspath(desc);
-  svn_boolean_t is_binary = svn_client_conflict_get_is_binary(desc);
+  svn_boolean_t is_binary = svn_mime_type_is_binary(
+                              svn_client_conflict_get_mime_type(desc));
   const char *base_abspath = svn_client_conflict_get_base_abspath(desc);
   const char *my_abspath = svn_client_conflict_get_my_abspath(desc);
   const char *their_abspath = svn_client_conflict_get_their_abspath(desc);



Mime
View raw message