svn commit: r1910112 - /subversion/trunk/subversion/libsvn_client/copy.c

[ds...@apache.org]

Author: dsahlberg
Date: Mon May 29 09:51:14 2023
New Revision: 1910112

URL: http://svn.apache.org/viewvc?rev=1910112&view=rev
Log:
Followup to r1909127: fix test failures on Windows

* libsvn_client/copy.c
  (try_copy): Dont convert urls to local_style in error message.
    Fix inconsistent indentation (tabs/spaces) introduced in r1909127.

See dev@ https://lists.apache.org/thread/f0bd030xhk3jtjn3rzk3588qro3f6pts


Modified:
    subversion/trunk/subversion/libsvn_client/copy.c

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1910112&r1=1910111&r2=1910112&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Mon May 29 09:51:14 2023
@@ -3093,10 +3093,14 @@ try_copy(svn_boolean_t *timestamp_sleep,
             return svn_error_createf
               (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
                is_move ?
-	         _("Cannot move path '%s' into its own child '%s'") :
-		 _("Cannot copy path '%s' into its own child '%s'"),
-               svn_dirent_local_style(pair->src_abspath_or_url, pool),
-               svn_dirent_local_style(pair->dst_abspath_or_url, pool));
+                 _("Cannot move path '%s' into its own child '%s'") :
+                 _("Cannot copy path '%s' into its own child '%s'"),
+               svn_path_is_url(pair->src_abspath_or_url) ?
+                 pair->src_abspath_or_url :
+                 svn_dirent_local_style(pair->src_abspath_or_url, pool),
+               svn_path_is_url(pair->dst_abspath_or_url) ?
+                 pair->dst_abspath_or_url :
+                 svn_dirent_local_style(pair->dst_abspath_or_url, pool));
         }
 
       svn_pool_destroy(iterpool);