| Alphare | |
| pulkit |
| hg-reviewers |
This make no significant performance change in practice (all ±2%) in practice,
but it will help us to distinct between some semantically different cases later
on.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/copy_tracing.rs (32 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 6c1e13b82c0d | 6bbefd68ba0b | Pierre-Yves David | Dec 2 2020, 9:24 AM |
| None => Some(vertex_copies), | None => Some(vertex_copies), | ||||
| // Merge has two parents needs to combines their copy | // Merge has two parents needs to combines their copy | ||||
| // information. | // information. | ||||
| // | // | ||||
| // If we got data from both parents, We need to combine | // If we got data from both parents, We need to combine | ||||
| // them. | // them. | ||||
| Some(copies) => Some(merge_copies_dict( | Some(copies) => Some(merge_copies_dict( | ||||
| &path_map, | &path_map, | ||||
| rev, | |||||
| vertex_copies, | vertex_copies, | ||||
| copies, | copies, | ||||
| &changes, | &changes, | ||||
| &mut oracle, | &mut oracle, | ||||
| )), | )), | ||||
| }; | }; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| /// merge two copies-mapping together, minor and major | /// merge two copies-mapping together, minor and major | ||||
| /// | /// | ||||
| /// In case of conflict, value from "major" will be picked, unless in some | /// In case of conflict, value from "major" will be picked, unless in some | ||||
| /// cases. See inline documentation for details. | /// cases. See inline documentation for details. | ||||
| fn merge_copies_dict<A: Fn(Revision, Revision) -> bool>( | fn merge_copies_dict<A: Fn(Revision, Revision) -> bool>( | ||||
| path_map: &TwoWayPathMap, | path_map: &TwoWayPathMap, | ||||
| current_merge: Revision, | |||||
| mut minor: TimeStampedPathCopies, | mut minor: TimeStampedPathCopies, | ||||
| mut major: TimeStampedPathCopies, | mut major: TimeStampedPathCopies, | ||||
| changes: &ChangedFiles, | changes: &ChangedFiles, | ||||
| oracle: &mut AncestorOracle<A>, | oracle: &mut AncestorOracle<A>, | ||||
| ) -> TimeStampedPathCopies { | ) -> TimeStampedPathCopies { | ||||
| // This closure exist as temporary help while multiple developper are | // This closure exist as temporary help while multiple developper are | ||||
| // actively working on this code. Feel free to re-inline it once this | // actively working on this code. Feel free to re-inline it once this | ||||
| // code is more settled. | // code is more settled. | ||||
| let mut cmp_value = | let mut cmp_value = | ||||
| |dest: &PathToken, | |dest: &PathToken, | ||||
| src_minor: &TimeStampedPathCopy, | src_minor: &TimeStampedPathCopy, | ||||
| src_major: &TimeStampedPathCopy| { | src_major: &TimeStampedPathCopy| { | ||||
| compare_value( | compare_value( | ||||
| path_map, changes, oracle, dest, src_minor, src_major, | path_map, | ||||
| current_merge, | |||||
| changes, | |||||
| oracle, | |||||
| dest, | |||||
| src_minor, | |||||
| src_major, | |||||
| ) | ) | ||||
| }; | }; | ||||
| if minor.is_empty() { | if minor.is_empty() { | ||||
| major | major | ||||
| } else if major.is_empty() { | } else if major.is_empty() { | ||||
| minor | minor | ||||
| } else if minor.len() * 2 < major.len() { | } else if minor.len() * 2 < major.len() { | ||||
| // Lets says we are merging two TimeStampedPathCopies instance A and B. | // Lets says we are merging two TimeStampedPathCopies instance A and B. | ||||
| /// Any side could be used (because they are the same) | /// Any side could be used (because they are the same) | ||||
| Any, | Any, | ||||
| } | } | ||||
| /// decide which side prevails in case of conflicting values | /// decide which side prevails in case of conflicting values | ||||
| #[allow(clippy::if_same_then_else)] | #[allow(clippy::if_same_then_else)] | ||||
| fn compare_value<A: Fn(Revision, Revision) -> bool>( | fn compare_value<A: Fn(Revision, Revision) -> bool>( | ||||
| path_map: &TwoWayPathMap, | path_map: &TwoWayPathMap, | ||||
| current_merge: Revision, | |||||
| changes: &ChangedFiles, | changes: &ChangedFiles, | ||||
| oracle: &mut AncestorOracle<A>, | oracle: &mut AncestorOracle<A>, | ||||
| dest: &PathToken, | dest: &PathToken, | ||||
| src_minor: &TimeStampedPathCopy, | src_minor: &TimeStampedPathCopy, | ||||
| src_major: &TimeStampedPathCopy, | src_major: &TimeStampedPathCopy, | ||||
| ) -> MergePick { | ) -> MergePick { | ||||
| if src_major.path == src_minor.path { | if src_major.rev == current_merge { | ||||
| if src_minor.rev == current_merge { | |||||
| if src_major.path.is_none() { | |||||
| // We cannot get different copy information for both p1 and p2 | |||||
| // from the same revision. Unless this was a | |||||
| // deletion | |||||
| MergePick::Any | |||||
| } else { | |||||
| unreachable!(); | |||||
| } | |||||
| } else { | |||||
| // The last value comes the current merge, this value -will- win | |||||
| // eventually. | |||||
| MergePick::Major | |||||
| } | |||||
| } else if src_minor.rev == current_merge { | |||||
| // The last value comes the current merge, this value -will- win | |||||
| // eventually. | |||||
| MergePick::Minor | |||||
| } else if src_major.path == src_minor.path { | |||||
| // we have the same value, but from other source; | // we have the same value, but from other source; | ||||
| if src_major.rev == src_minor.rev { | if src_major.rev == src_minor.rev { | ||||
| // If the two entry are identical, they are both valid | // If the two entry are identical, they are both valid | ||||
| MergePick::Any | MergePick::Any | ||||
| } else if oracle.is_overwrite(src_major.rev, src_minor.rev) { | } else if oracle.is_overwrite(src_major.rev, src_minor.rev) { | ||||
| MergePick::Minor | MergePick::Minor | ||||
| } else { | } else { | ||||
| MergePick::Major | MergePick::Major | ||||