| kevincox | |
| pulkit |
| hg-reviewers |
I also renamed vec to dirstate, because it was not a great name.
| No Linters Available |
| No Unit Test Coverage |
This one fails to apply on default. Skipping pushing this and it's accepted children.
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/dirstate/dirs_multiset.rs (38 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 1505548c035e | 59b21f0c6364 | Raphaël Gomès | Nov 29 2019, 11:19 AM |
| inner: FastHashMap<HgPathBuf, u32>, | inner: FastHashMap<HgPathBuf, u32>, | ||||
| } | } | ||||
| impl DirsMultiset { | impl DirsMultiset { | ||||
| /// Initializes the multiset from a dirstate. | /// Initializes the multiset from a dirstate. | ||||
| /// | /// | ||||
| /// If `skip_state` is provided, skips dirstate entries with equal state. | /// If `skip_state` is provided, skips dirstate entries with equal state. | ||||
| pub fn from_dirstate( | pub fn from_dirstate( | ||||
| vec: &FastHashMap<HgPathBuf, DirstateEntry>, | dirstate: &FastHashMap<HgPathBuf, DirstateEntry>, | ||||
| skip_state: Option<EntryState>, | skip_state: Option<EntryState>, | ||||
| ) -> Self { | ) -> Self { | ||||
| let mut multiset = DirsMultiset { | let mut multiset = DirsMultiset { | ||||
| inner: FastHashMap::default(), | inner: FastHashMap::default(), | ||||
| }; | }; | ||||
| for (filename, DirstateEntry { state, .. }) in vec { | for (filename, DirstateEntry { state, .. }) in dirstate { | ||||
| // This `if` is optimized out of the loop | // This `if` is optimized out of the loop | ||||
| if let Some(skip) = skip_state { | if let Some(skip) = skip_state { | ||||
| if skip != *state { | if skip != *state { | ||||
| multiset.add_path(filename); | multiset.add_path(filename); | ||||
| } | } | ||||
| } else { | } else { | ||||
| multiset.add_path(filename); | multiset.add_path(filename); | ||||
| } | } | ||||
| } | } | ||||
| multiset | multiset | ||||
| } | } | ||||
| /// Initializes the multiset from a manifest. | /// Initializes the multiset from a manifest. | ||||
| pub fn from_manifest(vec: &Vec<HgPathBuf>) -> Self { | pub fn from_manifest(manifest: &[impl AsRef<HgPath>]) -> Self { | ||||
| let mut multiset = DirsMultiset { | let mut multiset = DirsMultiset { | ||||
| inner: FastHashMap::default(), | inner: FastHashMap::default(), | ||||
| }; | }; | ||||
| for filename in vec { | for filename in manifest { | ||||
| multiset.add_path(filename); | multiset.add_path(filename.as_ref()); | ||||
| } | } | ||||
| multiset | multiset | ||||
| } | } | ||||
| /// Increases the count of deepest directory contained in the path. | /// Increases the count of deepest directory contained in the path. | ||||
| /// | /// | ||||
| /// If the directory is not yet in the map, adds its parents. | /// If the directory is not yet in the map, adds its parents. | ||||
| pub fn add_path(&mut self, path: &HgPath) { | pub fn add_path(&mut self, path: impl AsRef<HgPath>) { | ||||
| for subpath in files::find_dirs(path) { | for subpath in files::find_dirs(path.as_ref()) { | ||||
| if let Some(val) = self.inner.get_mut(subpath) { | if let Some(val) = self.inner.get_mut(subpath) { | ||||
| *val += 1; | *val += 1; | ||||
| break; | break; | ||||
| } | } | ||||
| self.inner.insert(subpath.to_owned(), 1); | self.inner.insert(subpath.to_owned(), 1); | ||||
| } | } | ||||
| } | } | ||||
| /// Decreases the count of deepest directory contained in the path. | /// Decreases the count of deepest directory contained in the path. | ||||
| /// | /// | ||||
| /// If it is the only reference, decreases all parents until one is | /// If it is the only reference, decreases all parents until one is | ||||
| /// removed. | /// removed. | ||||
| /// If the directory is not in the map, something horrible has happened. | /// If the directory is not in the map, something horrible has happened. | ||||
| pub fn delete_path( | pub fn delete_path( | ||||
| &mut self, | &mut self, | ||||
| path: &HgPath, | path: impl AsRef<HgPath>, | ||||
| ) -> Result<(), DirstateMapError> { | ) -> Result<(), DirstateMapError> { | ||||
| for subpath in files::find_dirs(path) { | for subpath in files::find_dirs(path.as_ref()) { | ||||
| match self.inner.entry(subpath.to_owned()) { | match self.inner.entry(subpath.to_owned()) { | ||||
| Entry::Occupied(mut entry) => { | Entry::Occupied(mut entry) => { | ||||
| let val = entry.get().clone(); | let val = entry.get().clone(); | ||||
| if val > 1 { | if val > 1 { | ||||
| entry.insert(val - 1); | entry.insert(val - 1); | ||||
| break; | break; | ||||
| } | } | ||||
| entry.remove(); | entry.remove(); | ||||
| } | } | ||||
| Entry::Vacant(_) => { | Entry::Vacant(_) => { | ||||
| return Err(DirstateMapError::PathNotFound( | return Err(DirstateMapError::PathNotFound( | ||||
| path.to_owned(), | path.as_ref().to_owned(), | ||||
| )) | )) | ||||
| } | } | ||||
| }; | }; | ||||
| } | } | ||||
| Ok(()) | Ok(()) | ||||
| } | } | ||||
| pub fn contains(&self, key: &HgPath) -> bool { | pub fn contains(&self, key: impl AsRef<HgPath>) -> bool { | ||||
| self.inner.contains_key(key) | self.inner.contains_key(key.as_ref()) | ||||
| } | } | ||||
| pub fn iter(&self) -> DirsMultisetIter { | pub fn iter(&self) -> DirsMultisetIter { | ||||
| self.inner.keys() | self.inner.keys() | ||||
| } | } | ||||
| pub fn len(&self) -> usize { | pub fn len(&self) -> usize { | ||||
| self.inner.len() | self.inner.len() | ||||
| } | } | ||||
| } | } | ||||
| #[cfg(test)] | #[cfg(test)] | ||||
| mod tests { | mod tests { | ||||
| use super::*; | use super::*; | ||||
| #[test] | #[test] | ||||
| fn test_delete_path_path_not_found() { | fn test_delete_path_path_not_found() { | ||||
| let mut map = DirsMultiset::from_manifest(&vec![]); | let manifest: Vec<HgPathBuf> = vec![]; | ||||
| let mut map = DirsMultiset::from_manifest(&manifest); | |||||
| let path = HgPathBuf::from_bytes(b"doesnotexist/"); | let path = HgPathBuf::from_bytes(b"doesnotexist/"); | ||||
| assert_eq!( | assert_eq!( | ||||
| Err(DirstateMapError::PathNotFound(path.to_owned())), | Err(DirstateMapError::PathNotFound(path.to_owned())), | ||||
| map.delete_path(&path) | map.delete_path(&path) | ||||
| ); | ); | ||||
| } | } | ||||
| #[test] | #[test] | ||||
| b"a/c/" | b"a/c/" | ||||
| ))), | ))), | ||||
| map.delete_path(HgPath::new(b"a/c/")) | map.delete_path(HgPath::new(b"a/c/")) | ||||
| ); | ); | ||||
| } | } | ||||
| #[test] | #[test] | ||||
| fn test_add_path_empty_path() { | fn test_add_path_empty_path() { | ||||
| let mut map = DirsMultiset::from_manifest(&vec![]); | let manifest: Vec<HgPathBuf> = vec![]; | ||||
| let mut map = DirsMultiset::from_manifest(&manifest); | |||||
| let path = HgPath::new(b""); | let path = HgPath::new(b""); | ||||
| map.add_path(path); | map.add_path(path); | ||||
| assert_eq!(1, map.len()); | assert_eq!(1, map.len()); | ||||
| } | } | ||||
| #[test] | #[test] | ||||
| fn test_add_path_successful() { | fn test_add_path_successful() { | ||||
| let mut map = DirsMultiset::from_manifest(&vec![]); | let manifest: Vec<HgPathBuf> = vec![]; | ||||
| let mut map = DirsMultiset::from_manifest(&manifest); | |||||
| map.add_path(HgPath::new(b"a/")); | map.add_path(HgPath::new(b"a/")); | ||||
| assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap()); | assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap()); | ||||
| assert_eq!(1, *map.inner.get(HgPath::new(b"")).unwrap()); | assert_eq!(1, *map.inner.get(HgPath::new(b"")).unwrap()); | ||||
| assert_eq!(2, map.len()); | assert_eq!(2, map.len()); | ||||
| // Non directory should be ignored | // Non directory should be ignored | ||||
| map.add_path(HgPath::new(b"a")); | map.add_path(HgPath::new(b"a")); | ||||
| .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v)) | .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v)) | ||||
| .collect(), | .collect(), | ||||
| }; | }; | ||||
| assert_eq!(map, expected); | assert_eq!(map, expected); | ||||
| } | } | ||||
| #[test] | #[test] | ||||
| fn test_dirsmultiset_new_empty() { | fn test_dirsmultiset_new_empty() { | ||||
| let new = DirsMultiset::from_manifest(&vec![]); | let manifest: Vec<HgPathBuf> = vec![]; | ||||
| let new = DirsMultiset::from_manifest(&manifest); | |||||
| let expected = DirsMultiset { | let expected = DirsMultiset { | ||||
| inner: FastHashMap::default(), | inner: FastHashMap::default(), | ||||
| }; | }; | ||||
| assert_eq!(expected, new); | assert_eq!(expected, new); | ||||
| let new = DirsMultiset::from_dirstate(&FastHashMap::default(), None); | let new = DirsMultiset::from_dirstate(&FastHashMap::default(), None); | ||||
| let expected = DirsMultiset { | let expected = DirsMultiset { | ||||
| inner: FastHashMap::default(), | inner: FastHashMap::default(), | ||||
| }; | }; | ||||
| assert_eq!(expected, new); | assert_eq!(expected, new); | ||||
| } | } | ||||
| #[test] | #[test] | ||||
| fn test_dirsmultiset_new_no_skip() { | fn test_dirsmultiset_new_no_skip() { | ||||
| let input_vec = ["a/", "b/", "a/c", "a/d/"] | let input_vec: Vec<HgPathBuf> = ["a/", "b/", "a/c", "a/d/"] | ||||
| .iter() | .iter() | ||||
| .map(|e| HgPathBuf::from_bytes(e.as_bytes())) | .map(|e| HgPathBuf::from_bytes(e.as_bytes())) | ||||
| .collect(); | .collect(); | ||||
| let expected_inner = [("", 2), ("a", 3), ("b", 1), ("a/d", 1)] | let expected_inner = [("", 2), ("a", 3), ("b", 1), ("a/d", 1)] | ||||
| .iter() | .iter() | ||||
| .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v)) | .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v)) | ||||
| .collect(); | .collect(); | ||||