svn commit: r1592150 - /subversion/trunk/subversion/svnmucc/svnmucc.c

[br...@apache.org]

Author: breser
Date: Sat May  3 05:49:05 2014
New Revision: 1592150

URL: http://svn.apache.org/r1592150
Log:
Follow up to r1592148. svnmucc: Also normalize line endings with -m argument.

* subversion/svnmucc/svnmucc.c
  (sanitize_log_sources): Remove translation and move it to ...
  (log_message_func): here, allowing both -m and -F to be normalized.


Modified:
    subversion/trunk/subversion/svnmucc/svnmucc.c

Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1592150&r1=1592149&r2=1592150&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Sat May  3 05:49:05 2014
@@ -365,21 +365,9 @@ sanitize_log_sources(const char **final_
   else if (filedata)
     {
       if (message)
-        {
-          return mutually_exclusive_logs_error();
-        }
-      else
-        {
-          svn_string_t *message_string;
-
-          message_string = svn_string_create_from_buf(filedata, scratch_pool);
-          SVN_ERR_W(svn_subst_translate_string2(&message_string, NULL, NULL,
-                                                message_string, NULL, FALSE,
-                                                result_pool, scratch_pool),
-                    _("Error normalizing log message to internal format"));
+        return mutually_exclusive_logs_error();
 
-          *final_message = message_string->data;
-        }
+      *final_message = apr_pstrdup(result_pool, filedata->data);
     }
   else if (message)
     {
@@ -411,7 +399,15 @@ log_message_func(const char **log_msg,
 
   if (lmb->log_message)
     {
-      *log_msg = apr_pstrdup(pool, lmb->log_message);
+      svn_string_t *message = svn_string_create(lmb->log_message, pool);
+
+      SVN_ERR_W(svn_subst_translate_string2(&message, NULL, NULL,
+                                            message, NULL, FALSE,
+                                            pool, pool),
+                _("Error normalizing log message to internal format"));
+
+      *log_msg = message->data;
+
       return SVN_NO_ERROR;
     }