This remove some conditional nesting and prepare for future work were we will
unify the handling of copies from p1 and p2.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/copy_tracing.rs (91 lines) |
| for rev in revs { | for rev in revs { | ||||
| let mut d: DataHolder<D> = DataHolder { data: None }; | let mut d: DataHolder<D> = DataHolder { data: None }; | ||||
| let (p1, p2, changes) = rev_info(rev, &mut d); | let (p1, p2, changes) = rev_info(rev, &mut d); | ||||
| // We will chain the copies information accumulated for the parent with | // We will chain the copies information accumulated for the parent with | ||||
| // the individual copies information the curent revision. Creating a | // the individual copies information the curent revision. Creating a | ||||
| // new TimeStampedPath for each `rev` → `children` vertex. | // new TimeStampedPath for each `rev` → `children` vertex. | ||||
| let mut copies: Option<InternalPathCopies> = None; | let mut copies: Option<InternalPathCopies> = None; | ||||
| if p1 != NULL_REVISION { | |||||
| // Retrieve data computed in a previous iteration | // Retrieve data computed in a previous iteration | ||||
| let parent_copies = get_and_clean_parent_copies( | let p1_copies = match p1 { | ||||
| NULL_REVISION => None, | |||||
| _ => get_and_clean_parent_copies( | |||||
| &mut all_copies, | &mut all_copies, | ||||
| &mut children_count, | &mut children_count, | ||||
| p1, | p1, | ||||
| ); | ), // will be None if the vertex is not to be traversed | ||||
| if let Some(parent_copies) = parent_copies { | }; | ||||
| let p2_copies = match p2 { | |||||
| NULL_REVISION => None, | |||||
| _ => get_and_clean_parent_copies( | |||||
| &mut all_copies, | |||||
| &mut children_count, | |||||
| p2, | |||||
| ), // 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 vertex_copies = 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 | // keep that data around for potential later combination | ||||
| copies = Some(vertex_copies); | copies = Some(vertex_copies); | ||||
| } | } | ||||
| } | if let Some(parent_copies) = p2_copies { | ||||
| if p2 != NULL_REVISION { | |||||
| // Retrieve data computed in a previous iteration | |||||
| let parent_copies = get_and_clean_parent_copies( | |||||
| &mut all_copies, | |||||
| &mut children_count, | |||||
| p2, | |||||
| ); | |||||
| if let Some(parent_copies) = parent_copies { | |||||
| // combine it with data for that revision | // combine it with data for that revision | ||||
| let vertex_copies = add_from_changes( | 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 { | copies = match copies { | ||||
| 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, | rev, | ||||
| vertex_copies, | vertex_copies, | ||||
| copies, | copies, | ||||
| &changes, | &changes, | ||||
| )), | )), | ||||
| }; | }; | ||||
| } | } | ||||
| } | |||||
| match copies { | match copies { | ||||
| Some(copies) => { | Some(copies) => { | ||||
| all_copies.insert(rev, copies); | all_copies.insert(rev, copies); | ||||
| } | } | ||||
| _ => {} | _ => {} | ||||
| } | } | ||||
| } | } | ||||