subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1186259 - in /subversion/branches/1.7.x-r1180154: ./ subversion/include/svn_sorts.h subversion/libsvn_client/merge.c subversion/libsvn_subr/mergeinfo.c subversion/libsvn_subr/sorts.c subversion/tests/libsvn_subr/mergeinfo-test.c
Date Wed, 19 Oct 2011 15:10:59 GMT
Author: pburba
Date: Wed Oct 19 15:10:59 2011
New Revision: 1186259

URL: http://svn.apache.org/viewvc?rev=1186259&view=rev
Log:
On the 1.7.x-r1180154 branch: Merge r1181090, r1181110, and r1181215 from
trunk -- No conflicts.

Modified:
    subversion/branches/1.7.x-r1180154/   (props changed)
    subversion/branches/1.7.x-r1180154/subversion/include/svn_sorts.h
    subversion/branches/1.7.x-r1180154/subversion/libsvn_client/merge.c
    subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/sorts.c
    subversion/branches/1.7.x-r1180154/subversion/tests/libsvn_subr/mergeinfo-test.c

Propchange: subversion/branches/1.7.x-r1180154/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 19 15:10:59 2011
@@ -64,4 +64,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
 6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1180154,1181155,1181609,
 1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147299,1147309,1147882,1148071,1148083,1148094,1148131,1148374,1148424,1148566,1148588,1148652,1148662,1148699,1148853,1148877,1148882,1148936,1149103,1149105,1149135,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151854,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,1153540,1153566,1153799,1153807,1153968,1154009,1154023,1154115,1154119,1154121,1154144,1154155,1154159,1154165,1154215,1154225,1154273,1154278,1154379,1154382,1154461,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,1155131,1155160,1155313,1155334,1155391,1155404,1156085,115
 6098,1156216,1156218,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158187,1158193-1158194,1158196,1158201,1158207,1158209-1158210,1158217,1158285,1158288,1158303,1158309,1158407,1158419,1158421,1158436,1158455,1158616-1158617,1158634,1158854,1158875,1158886,1158893,1158896,1158919,1158924,1158963,1159093,1159098,1159101,1159132,1159136,1159148,1159230,1159275,1159400,1159686,1159760,1159772,1160605,1160671,1160682,1160704-1160705,1160756,1161063,1161080,1161185,1161210,1161683,1161721,1162024,1162033,1162201,1162516,1162880,1162974,1162995,1163243,1163383,1163557,1163792,1163953,1164027,1164386,1164426,1164517,1164535,1164554,1164580,1164614,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1167681,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174652,1174761,1174797-1174798,1174806,1175888,1176915,1176949,1177001,1177492,1178280,1178282,1178942,1179680,1179767,1180154,1181090,1181110,
 1181155,1181215,1181609,1181666,1182115,1182527,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730

Modified: subversion/branches/1.7.x-r1180154/subversion/include/svn_sorts.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1180154/subversion/include/svn_sorts.h?rev=1186259&r1=1186258&r2=1186259&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1180154/subversion/include/svn_sorts.h (original)
+++ subversion/branches/1.7.x-r1180154/subversion/include/svn_sorts.h Wed Oct 19 15:10:59
2011
@@ -182,11 +182,15 @@ svn_sort__array_insert(const void *new_e
                        int insert_index);
 
 
-/* Remove the element at DELETE_INDEX from the array ARR.
-   If DELETE_INDEX is not a valid element of ARR do nothing. */
+/* Remove ELEMENTS_TO_DELETE elements starting  at DELETE_INDEX from the
+   array ARR. If DELETE_INDEX is not a valid element of ARR,
+   ELEMENTS_TO_DELETE is not greater than zero, or
+   DELETE_INDEX + ELEMENTS_TO_DELETE is greater than ARR->NELTS, then do
+   nothing. */
 void
 svn_sort__array_delete(apr_array_header_t *arr,
-                       int delete_index);
+                       int delete_index,
+                       int elements_to_delete);
 
 #ifdef __cplusplus
 }

Modified: subversion/branches/1.7.x-r1180154/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1180154/subversion/libsvn_client/merge.c?rev=1186259&r1=1186258&r2=1186259&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1180154/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/1.7.x-r1180154/subversion/libsvn_client/merge.c Wed Oct 19 15:10:59
2011
@@ -4619,7 +4619,7 @@ remove_absent_children(const char *targe
       if ((child->absent || child->scheduled_for_deletion)
           && svn_dirent_is_ancestor(target_wcpath, child->abspath))
         {
-          svn_sort__array_delete(children_with_mergeinfo, i--);
+          svn_sort__array_delete(children_with_mergeinfo, i--, 1);
         }
     }
 }
@@ -4655,7 +4655,7 @@ remove_children_with_deleted_mergeinfo(m
                        child->abspath,
                        APR_HASH_KEY_STRING))
         {
-          svn_sort__array_delete(notify_b->children_with_mergeinfo, i--);
+          svn_sort__array_delete(notify_b->children_with_mergeinfo, i--, 1);
         }
     }
 }

Modified: subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/mergeinfo.c?rev=1186259&r1=1186258&r2=1186259&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/mergeinfo.c Wed Oct 19 15:10:59
2011
@@ -891,8 +891,7 @@ adjust_remaining_ranges(apr_array_header
     }
 
   if (elements_to_delete)
-    for (i = starting_index; i < (elements_to_delete + starting_index); i++)
-      svn_sort__array_delete(rangelist, starting_index);
+    svn_sort__array_delete(rangelist, starting_index, elements_to_delete);
 }
 
 svn_error_t *

Modified: subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/sorts.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/sorts.c?rev=1186259&r1=1186258&r2=1186259&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/sorts.c (original)
+++ subversion/branches/1.7.x-r1180154/subversion/libsvn_subr/sorts.c Wed Oct 19 15:10:59
2011
@@ -248,22 +248,32 @@ svn_sort__array_insert(const void *new_e
 
 void
 svn_sort__array_delete(apr_array_header_t *arr,
-                       int delete_index)
+                       int delete_index,
+                       int elements_to_delete)
 {
-  /* Do we have a valid index? */
-  if (delete_index >= 0 && delete_index < arr->nelts)
+  /* Do we have a valid index and are there enough elements? */
+  if (delete_index >= 0
+      && delete_index < arr->nelts
+      && elements_to_delete > 0
+      && (elements_to_delete + delete_index) <= arr->nelts)
     {
       if (delete_index == (arr->nelts - 1))
         {
           /* Deleting the last or only element in an array is easy. */
           apr_array_pop(arr);
         }
+      else if ((delete_index + elements_to_delete) == arr->nelts)
+        {
+          /* Delete the last ELEMENTS_TO_DELETE elements. */
+          arr->nelts -= elements_to_delete;
+        }
       else
         {
-          memmove(arr->elts + arr->elt_size * delete_index,
-                  arr->elts + arr->elt_size * (delete_index + 1),
-                  arr->elt_size * (arr->nelts - 1 - delete_index));
-          --(arr->nelts);
+          memmove(
+            arr->elts + arr->elt_size * delete_index,
+            arr->elts + (arr->elt_size * (delete_index + elements_to_delete)),
+            arr->elt_size * (arr->nelts - elements_to_delete - delete_index));
+          arr->nelts -= elements_to_delete;
         }
     }
 }

Modified: subversion/branches/1.7.x-r1180154/subversion/tests/libsvn_subr/mergeinfo-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1180154/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1186259&r1=1186258&r2=1186259&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1180154/subversion/tests/libsvn_subr/mergeinfo-test.c (original)
+++ subversion/branches/1.7.x-r1180154/subversion/tests/libsvn_subr/mergeinfo-test.c Wed Oct
19 15:10:59 2011
@@ -1181,7 +1181,7 @@ test_rangelist_merge(apr_pool_t *pool)
     svn_merge_range_t expected_merge[6];
   };
 
-  #define SIZE_OF_RANGE_MERGE_TEST_ARRAY 67
+  #define SIZE_OF_RANGE_MERGE_TEST_ARRAY 68
   /* The actual test data. */
   struct rangelist_merge_test_data test_data[SIZE_OF_RANGE_MERGE_TEST_ARRAY] =
     {
@@ -1286,6 +1286,9 @@ test_rangelist_merge(apr_pool_t *pool)
 
       {"/A: 5-60", "/A: 3-4,50-100*", 2, {{2, 60, TRUE}, {60, 100, FALSE}}},
 
+      {"/A: 5,9,11-15,17,200-300,999", "/A: 7-50", 4,
+       {{4, 5, TRUE}, {6, 50, TRUE}, {199, 300, TRUE}, {998, 999, TRUE}}},
+
       /* A rangelist merged with an empty rangelist should equal the
          non-empty rangelist but in compacted form. */
       {"/A: 1-44,45,46,47-50",       "",  1, {{ 0, 50, TRUE }}},



Mime
View raw message