subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1506058 - /subversion/trunk/subversion/svn/status.c
Date Tue, 23 Jul 2013 14:27:07 GMT
Author: philip
Date: Tue Jul 23 14:27:07 2013
New Revision: 1506058

URL: http://svn.apache.org/r1506058
Log:
Make status convert paths to local style just before printing
rather than earlier.

* subversion/svn/status.c
  (make_relpath): Don't special case ".".
  (print_status): Convert to local style.
  (svn_cl__print_status): Don't convert to local style.

Modified:
    subversion/trunk/subversion/svn/status.c

Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1506058&r1=1506057&r2=1506058&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Tue Jul 23 14:27:07 2013
@@ -144,8 +144,7 @@ generate_status_desc(enum svn_wc_status_
    from TARGET_PATH is returned, but there is no error checking involved.
 
    The returned path is allocated from RESULT_POOL, all other
-   allocations are made in SCRATCH_POOL.  When the returned path is ""
-   the non-canonical value "." will be returned. */
+   allocations are made in SCRATCH_POOL.  */
 static const char *
 make_relpath(const char *target_abspath,
              const char *target_path,
@@ -168,8 +167,7 @@ make_relpath(const char *target_abspath,
   relative = svn_dirent_skip_ancestor(target_abspath, abspath);
   if (relative)
     {
-      path = svn_dirent_join(target_path, relative, result_pool);
-      return *path ? path : ".";
+      return svn_dirent_join(target_path, relative, result_pool);
     }
 
   /* An example:
@@ -207,8 +205,7 @@ make_relpath(const char *target_abspath,
       parent_dir_els = svn_dirent_join(parent_dir_els, "..", scratch_pool);
     }
 
-  path = svn_dirent_join(parent_dir_els, path, result_pool);
-  return *path ? path : ".";
+  return svn_dirent_join(parent_dir_els, path, result_pool);
 }
 
 
@@ -352,6 +349,8 @@ print_status(const char *target_abspath,
         }
     }
 
+  path = svn_dirent_local_style(path, pool);
+
   if (detailed)
     {
       char ood_status, lock_status;
@@ -626,8 +625,7 @@ svn_cl__print_status(const char *target_
         return SVN_NO_ERROR;
     }
 
-  return print_status(target_abspath, target_path,
-                      svn_dirent_local_style(path, pool),
+  return print_status(target_abspath, target_path, path,
                       detailed, show_last_committed, repos_locks, status,
                       text_conflicts, prop_conflicts, tree_conflicts,
                       ctx, pool);



Mime
View raw message