Index: subversion/clients/cmdline/props.c =================================================================== --- subversion/clients/cmdline/props.c (revision 9747) +++ subversion/clients/cmdline/props.c (arbetskopia) @@ -72,6 +72,13 @@ SVN_ERR (svn_cmdline_cstring_from_utf8 (&pname_stdout, pname, pool)); + /* ### We leave these printfs for now, since propval is translated + * into the output encoding by svn_subst_detranslate_string above. BTW, + * is it correct to convert to the native EOL style? We use \n for + * newline everywhere (thansk God!) and rely on the stdio to + * convert to CRLF if needed. So why do we convert it in this case? + * If we don't need to, we can just print out the raw value, having + * svn_cmdline_printf do the encoding conversion. */ if (names_only) printf (" %s\n", pname_stdout); else Index: subversion/clients/cmdline/cl.h =================================================================== --- subversion/clients/cmdline/cl.h (revision 9747) +++ subversion/clients/cmdline/cl.h (arbetskopia) @@ -191,8 +191,10 @@ /*** Command-line output functions -- printing to the user. ***/ -/* Print out commit information found in COMMIT_INFO to the console. */ -void svn_cl__print_commit_info (svn_client_commit_info_t *commit_info); +/* Print out commit information found in COMMIT_INFO to the console. + * POOL is used for temporay allocations. */ +svn_error_t *svn_cl__print_commit_info (svn_client_commit_info_t *commit_info, + apr_pool_t *pool); /* Print STATUS for PATH to stdout for human consumption. Prints in Index: subversion/clients/cmdline/propdel-cmd.c =================================================================== --- subversion/clients/cmdline/propdel-cmd.c (revision 9747) +++ subversion/clients/cmdline/propdel-cmd.c (arbetskopia) @@ -31,6 +31,7 @@ #include "svn_delta.h" #include "svn_error.h" #include "svn_utf.h" +#include "svn_path.h" #include "cl.h" @@ -92,11 +93,10 @@ &rev, FALSE, ctx, pool)); if (! opt_state->quiet) { - const char *pname_stdout; - SVN_ERR (svn_cmdline_cstring_from_utf8 (&pname_stdout, - pname_utf8, pool)); - printf (_("property '%s' deleted from repository revision %ld\n"), - pname_stdout, rev); + SVN_ERR (svn_cmdline_printf (pool, + _("property '%s' deleted from" + " repository revision %ld\n"), + pname_utf8, rev)); } } else if (opt_state->start_revision.kind != svn_opt_revision_unspecified) @@ -121,15 +121,14 @@ opt_state->recursive, subpool)); if (! opt_state->quiet) { - const char *pname_stdout; - const char *target_stdout; - SVN_ERR (svn_cmdline_cstring_from_utf8 (&pname_stdout, - pname_utf8, subpool)); - SVN_ERR (svn_cmdline_path_local_style_from_utf8 - (&target_stdout, target, subpool)); - printf ("property '%s' deleted%sfrom '%s'.\n", pname_stdout, - opt_state->recursive ? " (recursively) " : " ", - target_stdout); + SVN_ERR (svn_cmdline_printf (subpool, opt_state->recursive + ? _("property '%s' deleted" + " (recursively) from '%s'.\n") + : _("property '%s' deleted" + " from '%s'.\n"), + pname_utf8, + svn_path_local_style (target, + subpool))); } } svn_pool_destroy (subpool); Index: subversion/clients/cmdline/move-cmd.c =================================================================== --- subversion/clients/cmdline/move-cmd.c (revision 9747) +++ subversion/clients/cmdline/move-cmd.c (arbetskopia) @@ -77,7 +77,7 @@ SVN_ERR (svn_cl__cleanup_log_msg (ctx->log_msg_baton, err)); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + SVN_ERR (svn_cl__print_commit_info (commit_info, pool)); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/mkdir-cmd.c =================================================================== --- subversion/clients/cmdline/mkdir-cmd.c (revision 9747) +++ subversion/clients/cmdline/mkdir-cmd.c (arbetskopia) @@ -77,7 +77,7 @@ } if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + SVN_ERR (svn_cl__print_commit_info (commit_info, subpool)); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/copy-cmd.c =================================================================== --- subversion/clients/cmdline/copy-cmd.c (revision 9747) +++ subversion/clients/cmdline/copy-cmd.c (arbetskopia) @@ -111,7 +111,7 @@ ctx, pool))); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + SVN_ERR (svn_cl__print_commit_info (commit_info, pool)); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/util.c =================================================================== --- subversion/clients/cmdline/util.c (revision 9747) +++ subversion/clients/cmdline/util.c (arbetskopia) @@ -35,6 +35,7 @@ #include "svn_wc.h" #include "svn_client.h" +#include "svn_cmdline.h" #include "svn_string.h" #include "svn_path.h" #include "svn_delta.h" @@ -50,15 +51,16 @@ -void -svn_cl__print_commit_info (svn_client_commit_info_t *commit_info) +svn_error_t * +svn_cl__print_commit_info (svn_client_commit_info_t *commit_info, + apr_pool_t *pool) { if ((commit_info) && (SVN_IS_VALID_REVNUM (commit_info->revision))) - printf (_("\nCommitted revision %ld.\n"), - commit_info->revision); + SVN_ERR (svn_cmdline_printf (pool, _("\nCommitted revision %ld.\n"), + commit_info->revision)); - return; + return SVN_NO_ERROR; } Index: subversion/clients/cmdline/commit-cmd.c =================================================================== --- subversion/clients/cmdline/commit-cmd.c (revision 9747) +++ subversion/clients/cmdline/commit-cmd.c (arbetskopia) @@ -98,7 +98,7 @@ ctx, pool))); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + SVN_ERR (svn_cl__print_commit_info (commit_info, pool)); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/delete-cmd.c =================================================================== --- subversion/clients/cmdline/delete-cmd.c (revision 9747) +++ subversion/clients/cmdline/delete-cmd.c (arbetskopia) @@ -85,7 +85,7 @@ SVN_ERR (svn_cl__cleanup_log_msg (ctx->log_msg_baton, err)); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + SVN_ERR (svn_cl__print_commit_info (commit_info, pool)); return SVN_NO_ERROR; } Index: subversion/clients/cmdline/import-cmd.c =================================================================== --- subversion/clients/cmdline/import-cmd.c (revision 9747) +++ subversion/clients/cmdline/import-cmd.c (arbetskopia) @@ -119,7 +119,7 @@ pool))); if (commit_info && ! opt_state->quiet) - svn_cl__print_commit_info (commit_info); + SVN_ERR (svn_cl__print_commit_info (commit_info, pool)); return SVN_NO_ERROR; }