svn commit: r1934435 - subversion/trunk/subversion/svn

Author: rinrab
Date: Wed May 20 13:41:35 2026
New Revision: 1934435

Log:
Revert r1934424 and r1934426. Two broken and stupid changes.
Have a nice time discussing that on list. I'm not doing that anymore.
I don't even know how could I ever think of that.

Modified:
   subversion/trunk/subversion/svn/blame-cmd.c
   subversion/trunk/subversion/svn/list-cmd.c

Modified: subversion/trunk/subversion/svn/blame-cmd.c
==============================================================================
--- subversion/trunk/subversion/svn/blame-cmd.c	Wed May 20 12:58:03 2026	(r1934434)
+++ subversion/trunk/subversion/svn/blame-cmd.c	Wed May 20 13:41:35 2026	(r1934435)
@@ -24,7 +24,6 @@
 
 /*** Includes. ***/
 
-#include "private/svn_utf_private.h"
 #include "svn_client.h"
 #include "svn_error.h"
 #include "svn_dirent_uri.h"
@@ -151,9 +150,8 @@ print_line_info(svn_stream_t *out,
           time_stdout = "                                           -";
         }
 
-      SVN_ERR(svn_stream_printf(out, pool, "%s %s %s ", rev_str,
-                                svn_utf__cstring_utf8_align_right(
-                                    author ? author : "-", 10, pool),
+      SVN_ERR(svn_stream_printf(out, pool, "%s %10s %s ", rev_str,
+                                author ? author : "         -",
                                 time_stdout));
 
       if (path)
@@ -161,9 +159,8 @@ print_line_info(svn_stream_t *out,
     }
   else
     {
-      return svn_stream_printf(out, pool, "%s %s ", rev_str,
-                               svn_utf__cstring_utf8_align_right(
-                                   author ? author : "-", 10, pool));
+      return svn_stream_printf(out, pool, "%s %10.10s ", rev_str,
+                               author ? author : "         -");
     }
 
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/svn/list-cmd.c
==============================================================================
--- subversion/trunk/subversion/svn/list-cmd.c	Wed May 20 12:58:03 2026	(r1934434)
+++ subversion/trunk/subversion/svn/list-cmd.c	Wed May 20 13:41:35 2026	(r1934435)
@@ -31,7 +31,6 @@
 #include "svn_path.h"
 #include "svn_utf.h"
 #include "svn_opt.h"
-#include "private/svn_utf_private.h"
 
 #include "cl.h"
 
@@ -170,7 +169,7 @@ print_dirent(void *baton,
       /* We may have to adjust the width of th 'author' field. */
       if (dirent->last_author)
         {
-          int author_width = svn_utf_cstring_utf8_width(dirent->last_author);
+          const int author_width = (int)strlen(dirent->last_author);
           if (author_width > pb->author_width)
             {
               if (author_width < pb->max_author_width)
@@ -188,12 +187,10 @@ print_dirent(void *baton,
         }
 
       return svn_cmdline_printf
-              (scratch_pool, "%7ld %s %c %*s %12s %s%s\n",
+              (scratch_pool, "%7ld %-*.*s %c %*s %12s %s%s\n",
                dirent->created_rev,
-               svn_utf__cstring_utf8_align_left(
-                   dirent->last_author ? dirent->last_author : " ? ",
-                   pb->author_width,
-                   scratch_pool),
+               pb->author_width, pb->author_width,
+               dirent->last_author ? dirent->last_author : " ? ",
                lock ? 'O' : ' ',
                sizewidth, sizestr,
                utf8_timestr,