Author: rhuijben
Date: Thu Feb 12 15:04:11 2015
New Revision: 1659283

URL: http://svn.apache.org/r1659283
Log:
Make the paths in the 'svn info' output consistently use
svn_cl__local_style_skip_ancestor instead of a mix of wcroot relative,
absolute and normal relative paths with in some cases proper local and
in others '/' path separators.

* subversion/svn/info-cmd.c
  (print_info): Tweak moved to/from and property conflict paths.

* subversion/tests/cmdline/move_tests.py
  (move_func): Update expected result.
  (move_conflict_details): Update expected result.

* subversion/tests/cmdline/prop_tests.py
  (dir_prop_conflict_details): Update expected result.

Modified:
    subversion/trunk/subversion/svn/info-cmd.c
    subversion/trunk/subversion/tests/cmdline/move_tests.py
    subversion/trunk/subversion/tests/cmdline/prop_tests.py

Modified: subversion/trunk/subversion/svn/info-cmd.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1659283&r1=1659282&r2=1659283&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Thu Feb 12 15:04:11 2015
@@ -389,30 +389,18 @@ print_info(void *baton,
         SVN_ERR(svn_cmdline_printf(pool, _("Copied From Rev: %ld\n"),
                                    info->wc_info->copyfrom_rev));
       if (info->wc_info->moved_from_abspath)
-        {
-          const char *relpath;
-
-          relpath = svn_dirent_skip_ancestor(info->wc_info->wcroot_abspath,
-                                             
info->wc_info->moved_from_abspath);
-          if (relpath && relpath[0] != '\0')
-            SVN_ERR(svn_cmdline_printf(pool, _("Moved From: %s\n"), relpath));
-          else
-            SVN_ERR(svn_cmdline_printf(pool, _("Moved From: %s\n"),
-                                       info->wc_info->moved_from_abspath));
-        }
+        SVN_ERR(svn_cmdline_printf(pool, _("Moved From: %s\n"),
+                                   svn_cl__local_style_skip_ancestor(
+                                      path_prefix, 
+                                      info->wc_info->moved_from_abspath,
+                                      pool)));
 
       if (info->wc_info->moved_to_abspath)
-        {
-          const char *relpath;
-
-          relpath = svn_dirent_skip_ancestor(info->wc_info->wcroot_abspath,
-                                             info->wc_info->moved_to_abspath);
-          if (relpath && relpath[0] != '\0')
-            SVN_ERR(svn_cmdline_printf(pool, _("Moved To: %s\n"), relpath));
-          else
-            SVN_ERR(svn_cmdline_printf(pool, _("Moved To: %s\n"),
-                                       info->wc_info->moved_to_abspath));
-        }
+        SVN_ERR(svn_cmdline_printf(pool, _("Moved To: %s\n"),
+                                   svn_cl__local_style_skip_ancestor(
+                                      path_prefix, 
+                                      info->wc_info->moved_to_abspath,
+                                      pool)));
     }
 
   if (info->last_changed_author)
@@ -480,8 +468,10 @@ print_info(void *baton,
                     if (! printed_prop_conflict_file)
                       SVN_ERR(svn_cmdline_printf(pool,
                                 _("Conflict Properties File: %s\n"),
-                                svn_dirent_local_style(conflict->their_abspath,
-                                                       pool)));
+                                svn_cl__local_style_skip_ancestor(
+                                        path_prefix,
+                                        conflict->prop_reject_abspath,
+                                        pool)));
                     printed_prop_conflict_file = TRUE;
                   break;
 

Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1659283&r1=1659282&r2=1659283&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Thu Feb 12 15:04:11 
2015
@@ -853,13 +853,13 @@ def build_simple_file_move_func(sbox, so
       mv_info_src = [
         {
           'Path'       : re.escape(source_path),
-          'Moved To'   : re.escape(dest),
+          'Moved To'   : re.escape(sbox.ospath(dest)),
         }
       ]
       mv_info_dst = [
         {
           'Path'       : re.escape(dest_path),
-          'Moved From' : re.escape(source),
+          'Moved From' : re.escape(sbox.ospath(source)),
         }
       ]
 
@@ -1591,7 +1591,7 @@ def move_conflict_details(sbox):
 
   expected_info = [
     {
-      "Moved To": "B", # Just 'B'?? Not the full/relative path or something?
+      "Moved To": re.escape(sbox.ospath("B")),
       "Tree conflict": re.escape(
               'local dir moved away, incoming dir edit upon update' +
               ' Source  left: (dir) ^/A/B@1' +

Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1659283&r1=1659282&r2=1659283&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Thu Feb 12 15:04:11 
2015
@@ -2747,8 +2747,7 @@ def dir_prop_conflict_details(sbox):
   # The conflict properties file line was shown for previous versions, but the
   # conflict source urls are new since 1.8.
   expected_info = {
-    'Conflict Properties File' : re.escape(os.path.abspath(
-                                           
sbox.ospath('A/dir_conflicts.prej'))),
+    'Conflict Properties File' : 
re.escape(sbox.ospath('A/dir_conflicts.prej')),
     'Conflict Details': re.escape('incoming dir edit upon update'
                                            + ' Source  left: (dir) ^/A@1'
                                            + ' Source right: (dir) ^/A@2')


Reply via email to