Instead of filtering the relevant parent inside de ChangedFiles method, we now
yield all copies information and let the caller do the filtering. Soon, the
filtering will be replaced by dispatching.
| 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 (53 lines) |
| enum Action<'a> { | enum Action<'a> { | ||||
| /// The parent ? children edge is removing a file | /// The parent ? children edge is removing a file | ||||
| /// | /// | ||||
| /// (actually, this could be the edge from the other parent, but it does | /// (actually, this could be the edge from the other parent, but it does | ||||
| /// not matters) | /// not matters) | ||||
| Removed(&'a HgPath), | Removed(&'a HgPath), | ||||
| /// The parent ? children edge introduce copy information between (dest, | /// The parent ? children edge introduce copy information between (dest, | ||||
| /// source) | /// source) | ||||
| Copied(&'a HgPath, &'a HgPath), | CopiedFromP1(&'a HgPath, &'a HgPath), | ||||
| CopiedFromP2(&'a HgPath, &'a HgPath), | |||||
| } | } | ||||
| /// This express the possible "special" case we can get in a merge | /// This express the possible "special" case we can get in a merge | ||||
| /// | /// | ||||
| /// See mercurial/metadata.py for details on these values. | /// See mercurial/metadata.py for details on these values. | ||||
| #[derive(PartialEq)] | #[derive(PartialEq)] | ||||
| enum MergeCase { | enum MergeCase { | ||||
| /// Merged: file had history on both side that needed to be merged | /// Merged: file had history on both side that needed to be merged | ||||
| let end = end as usize; | let end = end as usize; | ||||
| let raw = (&self.index[start..end]) | let raw = (&self.index[start..end]) | ||||
| .try_into() | .try_into() | ||||
| .expect("failed to turn 4 bytes into 4 bytes"); | .expect("failed to turn 4 bytes into 4 bytes"); | ||||
| u32::from_be_bytes(raw) | u32::from_be_bytes(raw) | ||||
| } | } | ||||
| /// Return an iterator over all the `Action` in this instance. | /// Return an iterator over all the `Action` in this instance. | ||||
| fn iter_actions(&self, parent: Parent) -> ActionsIterator { | fn iter_actions(&self) -> ActionsIterator { | ||||
| ActionsIterator { | ActionsIterator { | ||||
| changes: &self, | changes: &self, | ||||
| parent: parent, | |||||
| current: 0, | current: 0, | ||||
| } | } | ||||
| } | } | ||||
| /// return the MergeCase value associated with a filename | /// return the MergeCase value associated with a filename | ||||
| fn get_merge_case(&self, path: &HgPath) -> MergeCase { | fn get_merge_case(&self, path: &HgPath) -> MergeCase { | ||||
| if self.nb_items == 0 { | if self.nb_items == 0 { | ||||
| return MergeCase::Normal; | return MergeCase::Normal; | ||||
| } | } | ||||
| } | } | ||||
| MergeCase::Normal | MergeCase::Normal | ||||
| } | } | ||||
| } | } | ||||
| struct ActionsIterator<'a> { | struct ActionsIterator<'a> { | ||||
| changes: &'a ChangedFiles<'a>, | changes: &'a ChangedFiles<'a>, | ||||
| parent: Parent, | |||||
| current: u32, | current: u32, | ||||
| } | } | ||||
| impl<'a> Iterator for ActionsIterator<'a> { | impl<'a> Iterator for ActionsIterator<'a> { | ||||
| type Item = Action<'a>; | type Item = Action<'a>; | ||||
| fn next(&mut self) -> Option<Action<'a>> { | fn next(&mut self) -> Option<Action<'a>> { | ||||
| let copy_flag = match self.parent { | |||||
| Parent::FirstParent => P1_COPY, | |||||
| Parent::SecondParent => P2_COPY, | |||||
| }; | |||||
| while self.current < self.changes.nb_items { | while self.current < self.changes.nb_items { | ||||
| let (flags, file, source) = self.changes.entry(self.current); | let (flags, file, source) = self.changes.entry(self.current); | ||||
| self.current += 1; | self.current += 1; | ||||
| if (flags & ACTION_MASK) == REMOVED { | if (flags & ACTION_MASK) == REMOVED { | ||||
| return Some(Action::Removed(file)); | return Some(Action::Removed(file)); | ||||
| } | } | ||||
| let copy = flags & COPY_MASK; | let copy = flags & COPY_MASK; | ||||
| if copy == copy_flag { | if copy == P1_COPY { | ||||
| return Some(Action::Copied(file, source)); | return Some(Action::CopiedFromP1(file, source)); | ||||
| } else if copy == P2_COPY { | |||||
| return Some(Action::CopiedFromP2(file, source)); | |||||
| } | } | ||||
| } | } | ||||
| return None; | return None; | ||||
| } | } | ||||
| } | } | ||||
| /// A small struct whose purpose is to ensure lifetime of bytes referenced in | /// A small struct whose purpose is to ensure lifetime of bytes referenced in | ||||
| /// ChangedFiles | /// ChangedFiles | ||||
| fn add_from_changes( | fn add_from_changes( | ||||
| path_map: &mut TwoWayPathMap, | path_map: &mut TwoWayPathMap, | ||||
| base_copies: &InternalPathCopies, | base_copies: &InternalPathCopies, | ||||
| changes: &ChangedFiles, | changes: &ChangedFiles, | ||||
| parent: Parent, | parent: Parent, | ||||
| current_rev: Revision, | current_rev: Revision, | ||||
| ) -> InternalPathCopies { | ) -> InternalPathCopies { | ||||
| let mut copies = base_copies.clone(); | let mut copies = base_copies.clone(); | ||||
| for action in changes.iter_actions(parent) { | for action in changes.iter_actions() { | ||||
| match action { | match action { | ||||
| Action::Copied(path_dest, path_source) => { | Action::CopiedFromP1(path_dest, path_source) => { | ||||
| add_one_copy( | match parent { | ||||
| _ => (), // not the parent we are looking for | |||||
| Parent::FirstParent => add_one_copy( | |||||
| current_rev, | current_rev, | ||||
| &mut path_map, | path_map, | ||||
| &mut copies, | &mut copies, | ||||
| &base_copies, | &base_copies, | ||||
| path_dest, | path_dest, | ||||
| path_source, | path_source, | ||||
| ); | ), | ||||
| }; | |||||
| } | |||||
| Action::CopiedFromP2(path_dest, path_source) => { | |||||
| match parent { | |||||
| _ => (), //not the parent we are looking for | |||||
| Parent::SecondParent => add_one_copy( | |||||
| current_rev, | |||||
| path_map, | |||||
| &mut copies, | |||||
| &base_copies, | |||||
| path_dest, | |||||
| path_source, | |||||
| ), | |||||
| }; | |||||
| } | } | ||||
| Action::Removed(deleted_path) => { | Action::Removed(deleted_path) => { | ||||
| // We must drop copy information for removed file. | // We must drop copy information for removed file. | ||||
| // | // | ||||
| // We need to explicitly record them as dropped to | // We need to explicitly record them as dropped to | ||||
| // propagate this information when merging two | // propagate this information when merging two | ||||
| // InternalPathCopies object. | // InternalPathCopies object. | ||||
| let deleted = path_map.tokenize(deleted_path); | let deleted = path_map.tokenize(deleted_path); | ||||