subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1677844 - in /subversion/branches/move-tracking-2/subversion: include/private/svn_branch.h libsvn_delta/branch.c libsvn_delta/compat3e.c
Date Tue, 05 May 2015 15:46:55 GMT
Author: julianfoad
Date: Tue May  5 15:46:55 2015
New Revision: 1677844

URL: http://svn.apache.org/r1677844
Log:
On the 'move-tracking-2' branch: Tweak function and variable names for
consistency: say 'subbranch' instead of 'sub_branch'.

* subversion/include/private/svn_branch.h,
  subversion/libsvn_delta/branch.c
  (svn_branch_get_all_subbranches): Was 'svn_branch_get_all_sub_branches'.
  (svn_branch_purge_r,
   svn_branch_delete_branch_r): Track the rename.
  (svn_branch_get_subbranches,
   svn_branch_get_subbranch_at_eid): Rename a local variable.
  (svn_branch_find_nested_branch_element_by_rrpath): Track the rename.
    Rename local variables.

* subversion/libsvn_delta/compat3e.c
  (convert_branch_to_paths_r): Track the rename.

Modified:
    subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
    subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c

Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h?rev=1677844&r1=1677843&r2=1677844&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h Tue May  5
15:46:55 2015
@@ -259,7 +259,7 @@ svn_branch_get_subbranches(const svn_bra
  * sub-branches of BRANCH.
  */
 apr_array_header_t *
-svn_branch_get_all_sub_branches(const svn_branch_state_t *branch,
+svn_branch_get_all_subbranches(const svn_branch_state_t *branch,
                                 apr_pool_t *result_pool,
                                 apr_pool_t *scratch_pool);
 

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1677844&r1=1677843&r2=1677844&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Tue May  5 15:46:55
2015
@@ -482,7 +482,7 @@ svn_branch_purge_r(svn_branch_state_t *b
   map_purge_orphans(branch->e_map, branch->root_eid, scratch_pool);
 
   /* second, remove subbranches that have no subbranch-root element */
-  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_sub_branches(
+  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
                             branch, scratch_pool, scratch_pool), scratch_pool))
     {
       svn_branch_state_t *b = bi->val;
@@ -747,19 +747,19 @@ svn_branch_get_subbranches(const svn_bra
   for (SVN_ARRAY_ITER(bi, branch->rev_root->branches, scratch_pool))
     {
       svn_branch_state_t *subbranch = bi->val;
-      const char *sub_branch_root_rrpath
+      const char *subbranch_root_rrpath
         = svn_branch_get_root_rrpath(subbranch, bi->iterpool);
 
       /* Is it an immediate child at or below EID? */
       if (subbranch->outer_branch == branch
-          && svn_relpath_skip_ancestor(top_rrpath, sub_branch_root_rrpath))
+          && svn_relpath_skip_ancestor(top_rrpath, subbranch_root_rrpath))
         SVN_ARRAY_PUSH(subbranches) = bi->val;
     }
   return subbranches;
 }
 
 apr_array_header_t *
-svn_branch_get_all_sub_branches(const svn_branch_state_t *branch,
+svn_branch_get_all_subbranches(const svn_branch_state_t *branch,
                                 apr_pool_t *result_pool,
                                 apr_pool_t *scratch_pool)
 {
@@ -783,7 +783,7 @@ svn_branch_get_subbranch_at_eid(svn_bran
   SVN_ITER_T(svn_branch_state_t) *bi;
 
   /* TODO: more efficient to search in branch->rev_root->branches */
-  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_sub_branches(
+  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
                             branch, scratch_pool, scratch_pool), scratch_pool))
     {
       if (bi->val->outer_eid == eid)
@@ -843,7 +843,7 @@ svn_branch_delete_branch_r(svn_branch_st
 {
   SVN_ITER_T(svn_branch_state_t) *bi;
 
-  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_sub_branches(
+  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
                             branch, scratch_pool, scratch_pool), scratch_pool))
     {
       svn_branch_delete_branch_r(bi->val, bi->iterpool);
@@ -1183,22 +1183,22 @@ svn_branch_find_nested_branch_element_by
 
   /* The path we're looking for is (path-wise) in this branch. See if it
      is also in a sub-branch (recursively). */
-  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_sub_branches(
+  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
                             root_branch, scratch_pool, scratch_pool),
                       scratch_pool))
     {
-      svn_branch_state_t *sub_branch;
-      int sub_branch_eid;
+      svn_branch_state_t *subbranch;
+      int subbranch_eid;
 
-      svn_branch_find_nested_branch_element_by_rrpath(&sub_branch,
-                                                      &sub_branch_eid,
+      svn_branch_find_nested_branch_element_by_rrpath(&subbranch,
+                                                      &subbranch_eid,
                                                       bi->val, rrpath,
                                                       bi->iterpool);
-      if (sub_branch)
+      if (subbranch)
         {
-           *branch_p = sub_branch;
+           *branch_p = subbranch;
            if (eid_p)
-             *eid_p = sub_branch_eid;
+             *eid_p = subbranch_eid;
            return;
          }
     }

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c?rev=1677844&r1=1677843&r2=1677844&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Tue May  5 15:46:55
2015
@@ -1114,7 +1114,7 @@ convert_branch_to_paths_r(apr_hash_t *pa
                           result_pool, scratch_pool);
 
   /* Rercurse into sub-branches */
-  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_sub_branches(
+  for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
                             branch, scratch_pool, scratch_pool), scratch_pool))
     {
       convert_branch_to_paths_r(paths_union, bi->val, result_pool, bi->iterpool);



Mime
View raw message