Author: hwright Date: Wed Oct 19 12:16:58 2011 New Revision: 1186148 URL: http://svn.apache.org/viewvc?rev=1186148&view=rev Log: Merge r1178942, r1182527 from trunk:
* r1178942, r1182527 Fix issue #4009, "Big trivial text files merged MUCH slower than binary" Justification: Much improved merge performance for, well, trivial text file merges! Votes: +1: stsp, pburba, rhuijben Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_wc/merge.c Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 19 12:16:58 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,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,1179680,1179767,1181155,1181609,1181666,1182115,1182904,1182909, 1183054,1183263,1183347,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,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,1181155,1181609,1181666,1182115,1182527, 1182904,1182909,1183054,1183263,1183347,1185730 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1186148&r1=1186147&r2=1186148&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Oct 19 12:16:58 2011 @@ -108,13 +108,6 @@ Veto-blocked changes: Approved changes: ================= - * r1178942, r1182527 - Fix issue #4009, "Big trivial text files merged MUCH slower than binary" - Justification: - Much improved merge performance for, well, trivial text file merges! - Votes: - +1: stsp, pburba, rhuijben - * r1185222 Make 'svn add --parents D/file' work if D is deleted. 'svn add D; svn add D/file' would work. Modified: subversion/branches/1.7.x/subversion/libsvn_wc/merge.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/merge.c?rev=1186148&r1=1186147&r2=1186148&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_wc/merge.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_wc/merge.c Wed Oct 19 12:16:58 2011 @@ -924,6 +924,77 @@ maybe_resolve_conflicts(svn_skel_t **wor return SVN_NO_ERROR; } + +/* Attempt a trivial merge of LEFT_ABSPATH and RIGHT_ABSPATH to TARGET_ABSPATH. + * The merge is trivial if the file at LEFT_ABSPATH equals TARGET_ABSPATH, + * because in this case the content of RIGHT_ABSPATH can be copied to the + * target. On success, set *MERGE_OUTCOME to SVN_WC_MERGE_MERGED in case the + * target was changed, or to SVN_WC_MERGE_UNCHANGED if the target was not + * changed. Install work queue items allocated in RESULT_POOL in *WORK_ITEMS. + * On failure, set *MERGE_OUTCOME to SVN_WC_MERGE_NO_MERGE. */ +static svn_error_t * +merge_file_trivial(svn_skel_t **work_items, + enum svn_wc_merge_outcome_t *merge_outcome, + const char *left_abspath, + const char *right_abspath, + const char *target_abspath, + svn_boolean_t dry_run, + svn_wc__db_t *db, + apr_pool_t *result_pool, + apr_pool_t *scratch_pool) +{ + svn_skel_t *work_item; + svn_boolean_t same_contents = FALSE; + svn_node_kind_t kind; + svn_boolean_t is_special; + + /* If the target is not a normal file, do not attempt a trivial merge. */ + SVN_ERR(svn_io_check_special_path(target_abspath, &kind, &is_special, + scratch_pool)); + if (kind != svn_node_file || is_special) + { + *merge_outcome = svn_wc_merge_no_merge; + return SVN_NO_ERROR; + } + + /* If the LEFT side of the merge is equal to WORKING, then we can + * copy RIGHT directly. */ + SVN_ERR(svn_io_files_contents_same_p(&same_contents, left_abspath, + target_abspath, scratch_pool)); + if (same_contents) + { + /* Check whether the left side equals the right side. + * If it does, there is no change to merge so we leave the target + * unchanged. */ + SVN_ERR(svn_io_files_contents_same_p(&same_contents, left_abspath, + right_abspath, scratch_pool)); + if (same_contents) + { + *merge_outcome = svn_wc_merge_unchanged; + } + else + { + *merge_outcome = svn_wc_merge_merged; + if (!dry_run) + { + SVN_ERR(svn_wc__wq_build_file_install( + &work_item, db, target_abspath, right_abspath, + FALSE /* use_commit_times */, + FALSE /* record_fileinfo */, + result_pool, scratch_pool)); + *work_items = svn_wc__wq_merge(*work_items, work_item, + result_pool); + } + } + + return SVN_NO_ERROR; + } + + *merge_outcome = svn_wc_merge_no_merge; + return SVN_NO_ERROR; +} + + /* XXX Insane amount of parameters... */ static svn_error_t* merge_text_file(svn_skel_t **work_items, @@ -1112,37 +1183,15 @@ merge_binary_file(svn_skel_t **work_item const char *merge_dirpath, *merge_filename; const char *conflict_wrk; svn_skel_t *work_item; - svn_boolean_t same_contents = FALSE; *work_items = NULL; svn_dirent_split(&merge_dirpath, &merge_filename, mt->local_abspath, pool); - /* Attempt to merge the binary file. At the moment, we can only - handle the special case: if the LEFT side of the merge is equal - to WORKING, then we can copy RIGHT directly. */ - SVN_ERR(svn_io_files_contents_same_p(&same_contents, - left_abspath, - mt->local_abspath, - scratch_pool)); + /* If we get here the binary files differ. Because we don't know how + * to merge binary files in a non-trivial way we always flag a conflict. */ - if (same_contents) - { - if (!dry_run) - { - SVN_ERR(svn_wc__wq_build_file_install(&work_item, - mt->db, mt->local_abspath, - right_abspath, - FALSE /* use_commit_times */, - FALSE /* record_fileinfo */, - result_pool, scratch_pool)); - *work_items = svn_wc__wq_merge(*work_items, work_item, result_pool); - } - - *merge_outcome = svn_wc_merge_merged; - return SVN_NO_ERROR; - } - else if (dry_run) + if (dry_run) { *merge_outcome = svn_wc_merge_conflict; return SVN_NO_ERROR; @@ -1366,41 +1415,48 @@ svn_wc__internal_merge(svn_skel_t **work SVN_ERR(maybe_update_target_eols(&left_abspath, &mt, left_abspath, cancel_func, cancel_baton, pool, pool)); - if (is_binary) + SVN_ERR(merge_file_trivial(work_items, merge_outcome, + left_abspath, right_abspath, + target_abspath, dry_run, db, + result_pool, scratch_pool)); + if (*merge_outcome == svn_wc_merge_no_merge) { - SVN_ERR(merge_binary_file(work_items, - merge_outcome, - &mt, - left_abspath, - right_abspath, - left_label, - right_label, - target_label, - dry_run, - left_version, - right_version, - detranslated_target_abspath, - conflict_func, - conflict_baton, - result_pool, scratch_pool)); - } - else - { - SVN_ERR(merge_text_file(work_items, - merge_outcome, - &mt, - left_abspath, - right_abspath, - left_label, - right_label, - target_label, - dry_run, - left_version, - right_version, - detranslated_target_abspath, - conflict_func, conflict_baton, - cancel_func, cancel_baton, - result_pool, scratch_pool)); + if (is_binary) + { + SVN_ERR(merge_binary_file(work_items, + merge_outcome, + &mt, + left_abspath, + right_abspath, + left_label, + right_label, + target_label, + dry_run, + left_version, + right_version, + detranslated_target_abspath, + conflict_func, + conflict_baton, + result_pool, scratch_pool)); + } + else + { + SVN_ERR(merge_text_file(work_items, + merge_outcome, + &mt, + left_abspath, + right_abspath, + left_label, + right_label, + target_label, + dry_run, + left_version, + right_version, + detranslated_target_abspath, + conflict_func, conflict_baton, + cancel_func, cancel_baton, + result_pool, scratch_pool)); + } } /* Merging is complete. Regardless of text or binariness, we might