Author: danielsh Date: Thu Oct 27 12:51:08 2011 New Revision: 1189725 URL: http://svn.apache.org/viewvc?rev=1189725&view=rev Log: Merge the r1189190 group from trunk:
* r1189190, r1189395 Restore backwards compatibility of 'svn status -u' in the javahl api to allow detecting deletes and adds. Justification: Without this patch only the text status is visible and restructuring changes aren't available. Votes: +1: markphip, rhuijben Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/CHANGES (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp subversion/branches/1.7.x/subversion/include/private/svn_adler32.h (props changed) subversion/branches/1.7.x/subversion/include/private/svn_string_private.h (props changed) subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h (props changed) subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c (props changed) subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/hash.c (props changed) subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c (props changed) subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py (props changed) Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -68,4 +68,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,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090, 1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1187311 +/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,1177732,1178280,1178282,1178942,1179680,1179767,1180154,1181090, 1181110,1181155,1181215,1181609,1181666,1182115,1182527,1182771,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185746,1185763,1185768,1185886,1185911,1185918,1186059,1186092,1186101,1186107,1186109,1186121,1186231,1186240,1186422,1186434,1186732,1186755,1186784,1186815,1186928,1187311,1189190,1189395 Propchange: subversion/branches/1.7.x/CHANGES ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -59,4 +59,4 @@ /subversion/branches/tree-conflicts/CHANGES:868291-873154 /subversion/branches/tree-conflicts-notify/CHANGES:873926-874008 /subversion/branches/uris-as-urls/CHANGES:1060426-1064427 -/subversion/trunk/CHANGES:1145993-1160329,1161063,1161210,1162110-1167354,1176949-1186825 +/subversion/trunk/CHANGES:1145993-1160329,1161063,1161210,1162110-1167354,1176949-1186825,1189190,1189395 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1189725&r1=1189724&r2=1189725&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Oct 27 12:51:08 2011 @@ -110,15 +110,6 @@ Veto-blocked changes: Approved changes: ================= - * r1189190, r1189395 - Restore backwards compatibility of 'svn status -u' in the javahl api to - allow detecting deletes and adds. - Justification: - Without this patch only the text status is visible and restructuring - changes aren't available. - Votes: - +1: markphip, rhuijben - * r1189580 Make sure no \r characters are encoded in strings in our generated sql headers. Modified: subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp?rev=1189725&r1=1189724&r2=1189725&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp (original) +++ subversion/branches/1.7.x/subversion/bindings/javahl/native/CreateJ.cpp Thu Oct 27 12:51:08 2011 @@ -533,11 +533,16 @@ CreateJ::Status(svn_wc_context_t *wc_ctx || text_status == svn_wc_status_conflicted) text_status = status->text_status; + enum svn_wc_status_kind repos_text_status = status->repos_node_status; + + if (repos_text_status == svn_wc_status_modified + || repos_text_status == svn_wc_status_conflicted) + repos_text_status = status->repos_text_status; + jboolean jIsConflicted = (status->conflicted == 1) ? JNI_TRUE : JNI_FALSE; jobject jTextType = EnumMapper::mapStatusKind(text_status); jobject jPropType = EnumMapper::mapStatusKind(status->prop_status); - jobject jRepositoryTextType = EnumMapper::mapStatusKind( - status->repos_text_status); + jobject jRepositoryTextType = EnumMapper::mapStatusKind(repos_text_status); jobject jRepositoryPropType = EnumMapper::mapStatusKind( status->repos_prop_status); jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE; Propchange: subversion/branches/1.7.x/subversion/include/private/svn_adler32.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -44,3 +44,4 @@ /subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483 /subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154 /subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008 +/subversion/trunk/subversion/include/private/svn_adler32.h:1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/include/private/svn_string_private.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -53,4 +53,4 @@ /subversion/branches/tree-conflicts/subversion/include/svn_string.h:868291-873154 /subversion/branches/tree-conflicts-notify/subversion/include/svn_string.h:873926-874008 /subversion/branches/uris-as-urls/subversion/include/svn_string.h:1060426-1064427 -/subversion/trunk/subversion/include/private/svn_string_private.h:1149240 +/subversion/trunk/subversion/include/private/svn_string_private.h:1149240,1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/include/private/svn_temp_serializer.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -1,2 +1,2 @@ /subversion/branches/revprop-packing/subversion/include/private/svn_temp_serializer.h:1143907,1143971,1144017,1144568 -/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301 +/subversion/trunk/subversion/include/private/svn_temp_serializer.h:1067687-1072301,1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -1,2 +1,2 @@ /subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.c:1143907,1143971,1144017,1144568 -/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301 +/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c:1067687-1072301,1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/libsvn_fs_fs/temp_serializer.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -1,2 +1,2 @@ /subversion/branches/revprop-packing/subversion/libsvn_fs_fs/temp_serializer.h:1143907,1143971,1144017,1144568 -/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301 +/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h:1067687-1072301,1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/adler32.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -2,3 +2,4 @@ /subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c:1037353-1067789 /subversion/branches/performance/subversion/libsvn_subr/adler32.c:1067697-1078365 /subversion/branches/revprop-packing/subversion/libsvn_subr/adler32.c:1143907,1143971,1144017,1144568 +/subversion/trunk/subversion/libsvn_subr/adler32.c:1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/hash.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -53,3 +53,4 @@ /subversion/branches/tree-conflicts/subversion/libsvn_subr/hash.c:868291-873154 /subversion/branches/tree-conflicts-notify/subversion/libsvn_subr/hash.c:873926-874008 /subversion/branches/uris-as-urls/subversion/libsvn_subr/hash.c:1060426-1064427 +/subversion/trunk/subversion/libsvn_subr/hash.c:1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/libsvn_subr/svn_temp_serializer.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -1,2 +1,2 @@ /subversion/branches/revprop-packing/subversion/libsvn_subr/svn_temp_serializer.c:1143907,1143971,1144017,1144568 -/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301 +/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c:1067687-1072301,1189190,1189395 Propchange: subversion/branches/1.7.x/subversion/tests/cmdline/basic_tests.py ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 27 12:51:08 2011 @@ -64,4 +64,4 @@ /subversion/branches/tree-conflicts/subversion/tests/cmdline/basic_tests.py:868291-873154 /subversion/branches/tree-conflicts-notify/subversion/tests/cmdline/basic_tests.py:873926-874008 /subversion/branches/uris-as-urls/subversion/tests/cmdline/basic_tests.py:1060426-1064427 -/subversion/trunk/subversion/tests/cmdline/basic_tests.py: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,1148853,1148877,1148882,1148936,1149105,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,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,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,1156098,1156216,1156218,115 6312,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,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174111,1174652,1174761,1174797-1174798,1174806,1175888,1176949,1177001,1177492,1179680,1179767,1181155,1181666,1185222 +/subversion/trunk/subversion/tests/cmdline/basic_tests.py: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,1148853,1148877,1148882,1148936,1149105,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,1151906,1151911,1152129,1152140,1152189-1152190,1152267,1152282,1152286,1152726,1152809,1153138,1153141,1153416,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,1156098,1156216,1156218,115 6312,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,1163557,1163792,1163953,1164027,1164386,1164517,1164535,1164554,1164580,1164645,1164760,1164765,1166500,1166555,1166678,1167062,1167173,1167209,1167269,1167503,1167659,1169524,1169531,1169650,1171708,1173111,1173425,1173639,1174051,1174060,1174111,1174652,1174761,1174797-1174798,1174806,1175888,1176949,1177001,1177492,1179680,1179767,1181155,1181666,1185222,1189190,1189395