| hg-reviewers |
In cad3dde7a573, the find_dirs util was introduced, but the second changeset
that made use of it didn't apply. This change fixes the issue.
| 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/dirstate/dirs_multiset.rs (37 lines) |
| // dirs_multiset.rs | // dirs_multiset.rs | ||||
| // | // | ||||
| // Copyright 2019 Raphaël Gomès <rgomes@octobus.net> | // Copyright 2019 Raphaël Gomès <rgomes@octobus.net> | ||||
| // | // | ||||
| // This software may be used and distributed according to the terms of the | // This software may be used and distributed according to the terms of the | ||||
| // GNU General Public License version 2 or any later version. | // GNU General Public License version 2 or any later version. | ||||
| //! A multiset of directory names. | //! A multiset of directory names. | ||||
| //! | //! | ||||
| //! Used to counts the references to directories in a manifest or dirstate. | //! Used to counts the references to directories in a manifest or dirstate. | ||||
| use std::collections::hash_map::{Entry, Iter}; | use std::collections::hash_map::{Entry, Iter}; | ||||
| use std::collections::HashMap; | use std::collections::HashMap; | ||||
| use {DirsIterable, DirstateEntry, DirstateMapError}; | use {DirsIterable, DirstateEntry, DirstateMapError}; | ||||
| use utils::files; | |||||
| #[derive(PartialEq, Debug)] | #[derive(PartialEq, Debug)] | ||||
| pub struct DirsMultiset { | pub struct DirsMultiset { | ||||
| inner: HashMap<Vec<u8>, u32>, | inner: HashMap<Vec<u8>, u32>, | ||||
| } | } | ||||
| impl DirsMultiset { | impl DirsMultiset { | ||||
| /// Initializes the multiset from a dirstate or a manifest. | /// Initializes the multiset from a dirstate or a manifest. | ||||
| multiset.add_path(filename); | multiset.add_path(filename); | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| multiset | multiset | ||||
| } | } | ||||
| /// Returns the slice up to the next directory name from right to left, | |||||
| /// without trailing slash | |||||
| fn find_dir(path: &[u8]) -> &[u8] { | |||||
| let mut path = path; | |||||
| loop { | |||||
| if let Some(new_pos) = path.len().checked_sub(1) { | |||||
| if path[new_pos] == b'/' { | |||||
| break &path[..new_pos]; | |||||
| } | |||||
| path = &path[..new_pos]; | |||||
| } else { | |||||
| break &[]; | |||||
| } | |||||
| } | |||||
| } | |||||
| /// 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: &[u8]) { | pub fn add_path(&mut self, path: &[u8]) { | ||||
| let mut pos = path.len(); | for subpath in files::find_dirs(path) { | ||||
| loop { | |||||
| let subpath = Self::find_dir(&path[..pos]); | |||||
| 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); | ||||
| pos = subpath.len(); | |||||
| if pos == 0 { | |||||
| break; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| /// 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: &[u8], | path: &[u8], | ||||
| ) -> Result<(), DirstateMapError> { | ) -> Result<(), DirstateMapError> { | ||||
| let mut pos = path.len(); | for subpath in files::find_dirs(path) { | ||||
| loop { | |||||
| let subpath = Self::find_dir(&path[..pos]); | |||||
| 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.to_owned(), | ||||
| )) | )) | ||||
| } | } | ||||
| }; | }; | ||||
| pos = subpath.len(); | |||||
| if pos == 0 { | |||||
| break; | |||||
| } | |||||
| } | } | ||||
| Ok(()) | Ok(()) | ||||
| } | } | ||||
| pub fn contains_key(&self, key: &[u8]) -> bool { | pub fn contains_key(&self, key: &[u8]) -> bool { | ||||
| self.inner.contains_key(key) | self.inner.contains_key(key) | ||||
| } | } | ||||