subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1628145 - /subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Date Mon, 29 Sep 2014 09:41:36 GMT
Author: julianfoad
Date: Mon Sep 29 09:41:36 2014
New Revision: 1628145

URL: http://svn.apache.org/r1628145
Log:
On the 'move-tracking-2' branch: Tweak the branch listsing output.

* subversion/svnmover/svnmover.c
  (family_list_branch_instances): Display EID:path mappings more concisely.

Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c

Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1628145&r1=1628144&r2=1628145&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Mon Sep 29 09:41:36
2014
@@ -1624,14 +1624,23 @@ family_list_branch_instances(svn_branch_
         = APR_ARRAY_IDX(family->branch_instances, b, svn_branch_instance_t *);
       int eid;
 
-      printf("  branch %d (root element %d -> '%s')\n",
+      printf("  branch %d (root element %d -> '/%s')\n",
              branch->definition->bid, branch->definition->root_eid,
              branch_get_root_path(branch));
       for (eid = family->first_eid; eid < family->next_eid; eid++)
         {
+          const char *rrpath = apr_hash_get(branch->eid_to_path,
+                                            &eid, sizeof(eid));
+
+          if (rrpath)
+            {
+              const char *relpath
+                = svn_relpath_skip_ancestor(branch_get_root_path(branch),
+                                            rrpath);
+
               printf("    e%d -> %s\n",
-                 eid,
-                 (char *)apr_hash_get(branch->eid_to_path, &eid, sizeof(eid)));
+                     eid, relpath[0] ? relpath : ".");
+            }
         }
     }
 



Mime
View raw message