[PATCH] Re: svn commit: r10652 - trunk/subversion/clients/cmdline

[Erik Huelsmann <e....@gmx.net>]

> On Sun, 2004-08-15 at 17:11, Erik Huelsmann wrote:
> > Really, I don't understand, since I did not change that part. The old
> code
> > opened a stream for stdout instead of using printf. That's all.
> 
> The old code sent the data to stdout via APR, bypassing the stdio
> layer.  The new code, if I understand right, goes through the stdio
> layer, and thus does newline translation.


Ok. Below I attached a patch which should resolve the situation. Posting
here, because the day is over and I don't want to hastily commit something
broken again.

What do you say?

bye,

Erik.

Log:
[[[
Followup to r10652: Fix Win32 output broken by r10652.

* subversion/clients/cmdline/log-cmd.c: Remove all eol translation; let 
  svn_cmdline_printf do it. Replace APR_EOL_STR with '\n' for
svn_cmdline_printf to
  translate it.

]]]


Index: subversion/clients/cmdline/log-cmd.c
===================================================================
--- subversion/clients/cmdline/log-cmd.c        (revision 10664)
+++ subversion/clients/cmdline/log-cmd.c        (working copy)
@@ -91,8 +91,7 @@
  
 /* The separator between log messages. */
 #define SEP_STRING \
- 
"------------------------------------------------------------------------" \
-  APR_EOL_STR
+ 
"------------------------------------------------------------------------\n"
  
  
 /* Implement `svn_log_message_receiver_t', printing the logs in
@@ -190,11 +189,7 @@
     SVN_ERR (lb->cancel_func (lb->cancel_baton));
  
   if (rev == 0)
-    {
-      return svn_cmdline_printf (pool,
-                                 _("No commit for revision 0.%s"),
-                                 APR_EOL_STR);
-    }
+    return svn_cmdline_printf (pool, _("No commit for revision 0.\n"));
  
   /* ### See http://subversion.tigris.org/issues/show_bug.cgi?id=807
      for more on the fallback fuzzy conversions below. */
@@ -212,24 +207,12 @@
     }
   else
     date = _("(no date)");
-
-  if (! lb->omit_log_message)
-    {
-      if (msg == NULL)
-        msg = "";
  
-      {
-        /* Convert log message from LF to native eol-style. */
-        svn_string_t *logmsg = svn_string_create (msg, pool);
-        SVN_ERR (svn_subst_detranslate_string (&logmsg, logmsg, FALSE,
pool));
-        msg = logmsg->data;
-      }
-    }
+  if (! lb->omit_log_message && msg == NULL)
+    msg = "";
  
-  SVN_ERR (svn_cmdline_printf (pool, "%s", SEP_STRING));
-
   SVN_ERR (svn_cmdline_printf (pool,
-                               "r%ld | %s | %s",
+                               SEP_STRING "r%ld | %s | %s",
                                rev, author, date));
  
   if (! lb->omit_log_message)
@@ -241,7 +224,7 @@
                                    (lines > 1) ? "s" : ""));
     }
  
-  SVN_ERR (svn_cmdline_printf (pool, APR_EOL_STR));
+  SVN_ERR (svn_cmdline_printf (pool, "\n"));
  
   if (changed_paths)
     {
@@ -253,7 +236,7 @@
                                      svn_sort_compare_items_as_paths,
pool);
  
       SVN_ERR (svn_cmdline_printf (pool,
-                                   _("Changed paths:%s"), APR_EOL_STR));
+                                   _("Changed paths:\n")));
       for (i = 0; i < sorted_paths->nelts; i++)
         {
           svn_sort__item_t *item = &(APR_ARRAY_IDX (sorted_paths, i,
@@ -272,7 +255,7 @@
                                 log_item->copyfrom_path,
                                 log_item->copyfrom_rev);
             }
-          SVN_ERR (svn_cmdline_printf (pool, "   %c %s%s" APR_EOL_STR,
+          SVN_ERR (svn_cmdline_printf (pool, "   %c %s%s\n",
                                        log_item->action, path,
                                        copy_data));
         }
@@ -281,7 +264,7 @@
   if (! lb->omit_log_message)
     {
       /* A blank line always precedes the log message. */
-      SVN_ERR (svn_cmdline_printf (pool, APR_EOL_STR "%s" APR_EOL_STR,
msg));
+      SVN_ERR (svn_cmdline_printf (pool, "\n%s\n", msg));
     }
  
   return SVN_NO_ERROR;
@@ -337,7 +320,6 @@
   /* Collate whole log message into sb before printing. */
   svn_stringbuf_t *sb = svn_stringbuf_create ("", pool);
   char *revstr;
-  const char *msg_native_eol;
  
   if (lb->cancel_func)
     SVN_ERR (lb->cancel_func (lb->cancel_baton));
@@ -427,13 +409,7 @@
  
       /* <msg>xxx</msg> */
       svn_xml_make_open_tag (&sb, pool, svn_xml_protect_pcdata, "msg",
NULL);
-      SVN_ERR (svn_subst_translate_cstring (msg, &msg_native_eol,
-                                            APR_EOL_STR, /* the 'native'
eol */-                                            FALSE,       /* no need
to repair */
-                                            NULL,        /* no keywords */
-                                            FALSE,       /* no expansion */
-                                            pool));
-      svn_xml_escape_cdata_cstring (&sb, msg_native_eol, pool);
+      svn_xml_escape_cdata_cstring (&sb, msg, pool);
       svn_xml_make_close_tag (&sb, pool, "msg");
     }
  

-- 
NEU: WLAN-Router f�r 0,- EUR* - auch f�r DSL-Wechsler!
GMX DSL = superg�nstig & kabellos http://www.gmx.net/de/go/dsl


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org