Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 96EBC7A2E for ; Thu, 20 Oct 2011 13:09:55 +0000 (UTC) Received: (qmail 75143 invoked by uid 500); 20 Oct 2011 13:09:55 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 75125 invoked by uid 500); 20 Oct 2011 13:09:55 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 75118 invoked by uid 99); 20 Oct 2011 13:09:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Oct 2011 13:09:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Oct 2011 13:09:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 38A82238888F for ; Thu, 20 Oct 2011 13:09:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1186785 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_subr/mergeinfo.c subversion/tests/libsvn_subr/mergeinfo-test.c Date: Thu, 20 Oct 2011 13:09:29 -0000 To: commits@subversion.apache.org From: hwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111020130930.38A82238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hwright Date: Thu Oct 20 13:09:29 2011 New Revision: 1186785 URL: http://svn.apache.org/viewvc?rev=1186785&view=rev Log: Reintegrate the 1.7.x-issue4032 branch: * r1182771 Fix issue 4032 Justification: Allow us to operate on existing invalid svn:mergeinfo Branch: 1.7.x-issue4032 Votes: +1: philip, stsp, rhuijben Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c subversion/branches/1.7.x/subversion/tests/libsvn_subr/mergeinfo-test.c Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Oct 20 13:09:29 2011 @@ -3,6 +3,7 @@ /subversion/branches/1.7.x-issue3888:1148937-1149162 /subversion/branches/1.7.x-issue3975:1160761-1161546 /subversion/branches/1.7.x-issue3976:1161731-1165397 +/subversion/branches/1.7.x-issue4032:1186668-1186784 /subversion/branches/1.7.x-issue4035:1186202-1186315 /subversion/branches/1.7.x-issue4035-r1185738:1186316-1186778 /subversion/branches/1.7.x-issue4k:1166502-1167193 @@ -67,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,1182904,1182909,1183054,1183263,1183347,1185222,1185242,1185280,1185282,1185730,1185738,1185763,1185768,1185886,1185911,1185918,1186092,1186101,1186107,1186109,1186121,1186231,1186240 +/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,1185763,1185768,1185886,1185911,1185918,1186092,1186101,1186107,1186109,1186121,1186231,1186240 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1186785&r1=1186784&r2=1186785&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Thu Oct 20 13:09:29 2011 @@ -63,12 +63,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1182771 - Fix issue 4032 - Justification: - Allow us to operate on existing invalid svn:mergeinfo - Branch: - 1.7.x-issue4032 - Votes: - +1: philip, stsp, rhuijben Modified: subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c?rev=1186785&r1=1186784&r2=1186785&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_subr/mergeinfo.c Thu Oct 20 13:09:29 2011 @@ -77,7 +77,7 @@ combine_ranges(svn_merge_range_t *output static svn_error_t * parse_pathname(const char **input, const char *end, - svn_stringbuf_t **pathname, + const char **pathname, apr_pool_t *pool) { const char *curr = *input; @@ -100,17 +100,11 @@ parse_pathname(const char **input, return svn_error_create(SVN_ERR_MERGEINFO_PARSE_ERROR, NULL, _("No pathname preceding ':'")); - /* Tolerate relative repository paths, but convert them to absolute. */ - if (**input == '/') - { - *pathname = svn_stringbuf_ncreate(*input, last_colon - *input, pool); - } - else - { - const char *repos_rel_path = apr_pstrndup(pool, *input, - last_colon - *input); - *pathname = svn_stringbuf_createf(pool, "/%s", repos_rel_path); - } + /* Tolerate relative repository paths, but convert them to absolute. + ### Efficiency? 1 string duplication here, 2 in canonicalize. */ + *pathname = svn_fspath__canonicalize(apr_pstrndup(pool, *input, + last_colon - *input), + pool); *input = last_colon; @@ -615,7 +609,7 @@ static svn_error_t * parse_revision_line(const char **input, const char *end, svn_mergeinfo_t hash, apr_pool_t *pool) { - svn_stringbuf_t *pathname; + const char *pathname; apr_array_header_t *existing_rangelist; apr_array_header_t *rangelist = apr_array_make(pool, 1, sizeof(svn_merge_range_t *)); @@ -628,7 +622,7 @@ parse_revision_line(const char **input, *input = *input + 1; - SVN_ERR(parse_rangelist(input, end, rangelist, pathname->data, pool)); + SVN_ERR(parse_rangelist(input, end, rangelist, pathname, pool)); if (*input != end && *(*input) != '\n') return svn_error_createf(SVN_ERR_MERGEINFO_PARSE_ERROR, NULL, @@ -694,11 +688,11 @@ parse_revision_line(const char **input, leading slash, e.g. "trunk:4033\n/trunk:4039-4995". In the event we encounter this we merge the rangelists together under a single absolute path key. */ - existing_rangelist = apr_hash_get(hash, pathname->data, APR_HASH_KEY_STRING); + existing_rangelist = apr_hash_get(hash, pathname, APR_HASH_KEY_STRING); if (existing_rangelist) SVN_ERR(svn_rangelist_merge(&rangelist, existing_rangelist, pool)); - apr_hash_set(hash, pathname->data, APR_HASH_KEY_STRING, rangelist); + apr_hash_set(hash, pathname, APR_HASH_KEY_STRING, rangelist); return SVN_NO_ERROR; } Modified: subversion/branches/1.7.x/subversion/tests/libsvn_subr/mergeinfo-test.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1186785&r1=1186784&r2=1186785&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/tests/libsvn_subr/mergeinfo-test.c (original) +++ subversion/branches/1.7.x/subversion/tests/libsvn_subr/mergeinfo-test.c Thu Oct 20 13:09:29 2011 @@ -117,7 +117,7 @@ verify_mergeinfo_parse(const char *input -> merge ranges. */ static apr_hash_t *info1, *info2; -#define NBR_MERGEINFO_VALS 20 +#define NBR_MERGEINFO_VALS 24 /* Valid mergeinfo values. */ static const char * const mergeinfo_vals[NBR_MERGEINFO_VALS] = @@ -146,7 +146,12 @@ static const char * const mergeinfo_vals "/gunther_branch:7-12*,1,5-10*", /* Adjacent rangelists of differing inheritability. */ "/b5:5-53,1-4,54-90*", - "/c0:1-77,12-44" + "/c0:1-77,12-44", + /* Non-canonical paths. */ + "/A/:7-8", + "/A///:7-8", + "/A/.:7-8", + "/A/./B:7-8" }; /* Paths corresponding to mergeinfo_vals. */ static const char * const mergeinfo_paths[NBR_MERGEINFO_VALS] = @@ -173,7 +178,13 @@ static const char * const mergeinfo_path "/gunther_branch", "/gunther_branch", "/b5", - "/c0" + "/c0", + + /* non-canonical paths converted to canonical */ + "/A", + "/A", + "/A", + "/A/B" }; /* First ranges from the paths identified by mergeinfo_paths. */ static svn_merge_range_t mergeinfo_ranges[NBR_MERGEINFO_VALS][MAX_NBR_RANGES] = @@ -200,6 +211,10 @@ static svn_merge_range_t mergeinfo_range { {0, 1, TRUE}, {4, 12, FALSE} }, { {0, 53, TRUE}, {53, 90, FALSE} }, { {0, 77, TRUE} }, + { {6, 8, TRUE} }, + { {6, 8, TRUE} }, + { {6, 8, TRUE} }, + { {6, 8, TRUE} }, }; static svn_error_t *