##// END OF EJS Templates
copies-rust: hide most of the comparison details inside a closure...
marmoute -
r46743:c58c8f1d default
parent child Browse files
Show More
@@ -463,6 +463,15 b' fn merge_copies_dict<A: Fn(Revision, Rev'
463 changes: &ChangedFiles,
463 changes: &ChangedFiles,
464 oracle: &mut AncestorOracle<A>,
464 oracle: &mut AncestorOracle<A>,
465 ) -> TimeStampedPathCopies {
465 ) -> TimeStampedPathCopies {
466 // This closure exist as temporary help while multiple developper are
467 // actively working on this code. Feel free to re-inline it once this
468 // code is more settled.
469 let mut cmp_value =
470 |dest: &HgPathBuf,
471 src_minor: &TimeStampedPathCopy,
472 src_major: &TimeStampedPathCopy| {
473 compare_value(changes, oracle, dest, src_minor, src_major)
474 };
466 if minor.is_empty() {
475 if minor.is_empty() {
467 major
476 major
468 } else if major.is_empty() {
477 } else if major.is_empty() {
@@ -499,9 +508,7 b' fn merge_copies_dict<A: Fn(Revision, Rev'
499 DiffItem::Update { old, new } => {
508 DiffItem::Update { old, new } => {
500 let (dest, src_major) = new;
509 let (dest, src_major) = new;
501 let (_, src_minor) = old;
510 let (_, src_minor) = old;
502 match compare_value(
511 match cmp_value(dest, src_minor, src_major) {
503 changes, oracle, dest, src_minor, src_major,
504 ) {
505 MergePick::Major => to_minor(dest, src_major),
512 MergePick::Major => to_minor(dest, src_major),
506 MergePick::Minor => to_major(dest, src_minor),
513 MergePick::Minor => to_major(dest, src_minor),
507 // If the two entry are identical, no need to do
514 // If the two entry are identical, no need to do
General Comments 0
You need to be logged in to leave comments. Login now