This is a bit more idiomatic and this prepare a future refactoring where
InternalCopies from both parent would be updated at the same time.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
These first two match expressions could be calls to Option::map instead, but this is fine.
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/copy_tracing.rs (54 lines) |
| let p2_copies = match p2 { | let p2_copies = match p2 { | ||||
| NULL_REVISION => None, | NULL_REVISION => None, | ||||
| _ => get_and_clean_parent_copies( | _ => get_and_clean_parent_copies( | ||||
| &mut all_copies, | &mut all_copies, | ||||
| &mut children_count, | &mut children_count, | ||||
| p2, | p2, | ||||
| ), // will be None if the vertex is not to be traversed | ), // will be None if the vertex is not to be traversed | ||||
| }; | }; | ||||
| if let Some(parent_copies) = p1_copies { | |||||
| // combine it with data for that revision | // combine it with data for that revision | ||||
| let vertex_copies = add_from_changes( | let p1_copies = match p1_copies { | ||||
| None => None, | |||||
| Some(parent_copies) => Some(add_from_changes( | |||||
| &mut path_map, | &mut path_map, | ||||
| &parent_copies, | &parent_copies, | ||||
| &changes, | &changes, | ||||
| Parent::FirstParent, | Parent::FirstParent, | ||||
| rev, | rev, | ||||
| ); | )), | ||||
| // keep that data around for potential later combination | }; | ||||
| copies = Some(vertex_copies); | let p2_copies = match p2_copies { | ||||
| } | None => None, | ||||
| if let Some(parent_copies) = p2_copies { | Some(parent_copies) => Some(add_from_changes( | ||||
| // combine it with data for that revision | |||||
| let vertex_copies = add_from_changes( | |||||
| &mut path_map, | &mut path_map, | ||||
| &parent_copies, | &parent_copies, | ||||
| &changes, | &changes, | ||||
| Parent::SecondParent, | Parent::SecondParent, | ||||
| rev, | rev, | ||||
| ); | |||||
| copies = match copies { | |||||
| None => Some(vertex_copies), | |||||
| // Merge has two parents needs to combines their copy | |||||
| // information. | |||||
| // | |||||
| // If we got data from both parents, We need to combine | |||||
| // them. | |||||
| Some(copies) => Some(merge_copies_dict( | |||||
| &path_map, | |||||
| rev, | |||||
| vertex_copies, | |||||
| copies, | |||||
| &changes, | |||||
| )), | )), | ||||
| }; | }; | ||||
| } | let copies = match (p1_copies, p2_copies) { | ||||
| match copies { | (None, None) => None, | ||||
| Some(copies) => { | (c, None) => c, | ||||
| all_copies.insert(rev, copies); | (None, c) => c, | ||||
| } | (Some(p1_copies), Some(p2_copies)) => Some(merge_copies_dict( | ||||
| _ => {} | &path_map, rev, p2_copies, p1_copies, &changes, | ||||
| )), | |||||
| }; | |||||
| if let Some(c) = copies { | |||||
| all_copies.insert(rev, c); | |||||
| } | } | ||||
| } | } | ||||
| // Drop internal information (like the timestamp) and return the final | // Drop internal information (like the timestamp) and return the final | ||||
| // mapping. | // mapping. | ||||
| let tt_result = all_copies | let tt_result = all_copies | ||||
| .remove(&target_rev) | .remove(&target_rev) | ||||
| .expect("target revision was not processed"); | .expect("target revision was not processed"); | ||||