##// END OF EJS Templates
dirstate: clarify the message in nonnormal checking...
dirstate: clarify the message in nonnormal checking The previous message was quite verbose and hard to understand. The new one should be friendlier. Differential Revision: https://phab.mercurial-scm.org/D11382

File last commit:

r48126:ed1583a8 default
r48755:fea24454 default
Show More
dirs_multiset.rs
430 lines | 13.2 KiB | application/rls-services+xml | RustLexer
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 // dirs_multiset.rs
//
// Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//! A multiset of directory names.
//!
//! Used to counts the references to directories in a manifest or dirstate.
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 use crate::dirstate_tree::on_disk::DirstateV2ParseError;
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 use crate::{
Raphaël Gomès
rust-dirs-multiset: add `DirsChildrenMultiset`...
r44739 dirstate::EntryState,
utils::{
files,
Raphaël Gomès
rust-dirs-multiset: improve temporary error message...
r44765 hg_path::{HgPath, HgPathBuf, HgPathError},
Raphaël Gomès
rust-dirs-multiset: add `DirsChildrenMultiset`...
r44739 },
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 DirstateEntry, DirstateError, DirstateMapError, FastHashMap,
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 };
Raphaël Gomès
rust-dirs-multiset: add `DirsChildrenMultiset`...
r44739 use std::collections::{hash_map, hash_map::Entry, HashMap, HashSet};
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
Yuya Nishihara
rust-dirstate: specify concrete return type of DirsMultiset::iter()...
r43155 // could be encapsulated if we care API stability more seriously
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 pub type DirsMultisetIter<'a> = hash_map::Keys<'a, HgPathBuf, u32>;
Yuya Nishihara
rust-dirstate: specify concrete return type of DirsMultiset::iter()...
r43155
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 #[derive(PartialEq, Debug)]
pub struct DirsMultiset {
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 inner: FastHashMap<HgPathBuf, u32>,
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
impl DirsMultiset {
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 /// Initializes the multiset from a dirstate.
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 ///
/// If `skip_state` is provided, skips dirstate entries with equal state.
Simon Sapin
rust: Return owned instead of borrowed DirstateEntry in DirstateMap APIs...
r48123 pub fn from_dirstate<I, P>(
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 dirstate: I,
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 skip_state: Option<EntryState>,
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 ) -> Result<Self, DirstateError>
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 where
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 I: IntoIterator<
Item = Result<(P, DirstateEntry), DirstateV2ParseError>,
>,
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 P: AsRef<HgPath>,
{
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let mut multiset = DirsMultiset {
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 inner: FastHashMap::default(),
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 };
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 for item in dirstate {
let (filename, entry) = item?;
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 let filename = filename.as_ref();
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 // This `if` is optimized out of the loop
if let Some(skip) = skip_state {
Simon Sapin
rust: Use `&HgPath` instead of `&HgPathBuf` in may APIs...
r47894 if skip != entry.state {
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 multiset.add_path(filename)?;
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 } else {
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 multiset.add_path(filename)?;
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
}
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 Ok(multiset)
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 /// Initializes the multiset from a manifest.
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 pub fn from_manifest(
manifest: &[impl AsRef<HgPath>],
) -> Result<Self, DirstateMapError> {
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let mut multiset = DirsMultiset {
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 inner: FastHashMap::default(),
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 };
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 for filename in manifest {
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 multiset.add_path(filename.as_ref())?;
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 }
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 Ok(multiset)
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 }
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 /// Increases the count of deepest directory contained in the path.
///
/// If the directory is not yet in the map, adds its parents.
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 pub fn add_path(
&mut self,
path: impl AsRef<HgPath>,
) -> Result<(), DirstateMapError> {
for subpath in files::find_dirs(path.as_ref()) {
Raphaël Gomès
rust-dirs: address failing tests for `dirs` impl with a temporary fix...
r44227 if subpath.as_bytes().last() == Some(&b'/') {
// TODO Remove this once PathAuditor is certified
// as the only entrypoint for path data
Raphaël Gomès
rust-dirs-multiset: improve temporary error message...
r44765 let second_slash_index = subpath.len() - 1;
return Err(DirstateMapError::InvalidPath(
HgPathError::ConsecutiveSlashes {
bytes: path.as_ref().as_bytes().to_owned(),
second_slash_index,
},
));
Raphaël Gomès
rust-dirs: address failing tests for `dirs` impl with a temporary fix...
r44227 }
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 if let Some(val) = self.inner.get_mut(subpath) {
*val += 1;
break;
}
self.inner.insert(subpath.to_owned(), 1);
}
Raphaël Gomès
rust-dirs: address failing tests for `dirs` impl with a temporary fix...
r44227 Ok(())
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
/// Decreases the count of deepest directory contained in the path.
///
/// If it is the only reference, decreases all parents until one is
/// removed.
/// If the directory is not in the map, something horrible has happened.
pub fn delete_path(
&mut self,
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 path: impl AsRef<HgPath>,
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 ) -> Result<(), DirstateMapError> {
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 for subpath in files::find_dirs(path.as_ref()) {
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 match self.inner.entry(subpath.to_owned()) {
Entry::Occupied(mut entry) => {
Raphaël Gomès
rust: do a clippy pass...
r45500 let val = *entry.get();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 if val > 1 {
entry.insert(val - 1);
break;
}
entry.remove();
}
Entry::Vacant(_) => {
Raphaël Gomès
rust: run rfmt on all hg-core/hg-cpython code...
r42760 return Err(DirstateMapError::PathNotFound(
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 path.as_ref().to_owned(),
Raphaël Gomès
rust: run rfmt on all hg-core/hg-cpython code...
r42760 ))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
};
}
Ok(())
}
Raphaël Gomès
rust: remove Deref in favor of explicit methods...
r42762
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 pub fn contains(&self, key: impl AsRef<HgPath>) -> bool {
self.inner.contains_key(key.as_ref())
Raphaël Gomès
rust: remove Deref in favor of explicit methods...
r42762 }
Yuya Nishihara
rust-dirstate: specify concrete return type of DirsMultiset::iter()...
r43155 pub fn iter(&self) -> DirsMultisetIter {
Raphaël Gomès
rust-dirstate: improve API of `DirsMultiset`...
r42995 self.inner.keys()
Raphaël Gomès
rust: remove Deref in favor of explicit methods...
r42762 }
pub fn len(&self) -> usize {
self.inner.len()
}
Raphaël Gomès
rust: do a clippy pass...
r45500
pub fn is_empty(&self) -> bool {
self.len() == 0
}
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
Raphaël Gomès
rust-dirs-multiset: add `DirsChildrenMultiset`...
r44739 /// This is basically a reimplementation of `DirsMultiset` that stores the
/// children instead of just a count of them, plus a small optional
/// optimization to avoid some directories we don't need.
#[derive(PartialEq, Debug)]
pub struct DirsChildrenMultiset<'a> {
inner: FastHashMap<&'a HgPath, HashSet<&'a HgPath>>,
only_include: Option<HashSet<&'a HgPath>>,
}
impl<'a> DirsChildrenMultiset<'a> {
pub fn new(
paths: impl Iterator<Item = &'a HgPathBuf>,
only_include: Option<&'a HashSet<impl AsRef<HgPath> + 'a>>,
) -> Self {
let mut new = Self {
inner: HashMap::default(),
only_include: only_include
Raphaël Gomès
rust: do a clippy pass...
r45500 .map(|s| s.iter().map(AsRef::as_ref).collect()),
Raphaël Gomès
rust-dirs-multiset: add `DirsChildrenMultiset`...
r44739 };
for path in paths {
new.add_path(path)
}
new
}
fn add_path(&mut self, path: &'a (impl AsRef<HgPath> + 'a)) {
if path.as_ref().is_empty() {
return;
}
for (directory, basename) in files::find_dirs_with_base(path.as_ref())
{
if !self.is_dir_included(directory) {
continue;
}
self.inner
.entry(directory)
.and_modify(|e| {
e.insert(basename);
})
.or_insert_with(|| {
let mut set = HashSet::new();
set.insert(basename);
set
});
}
}
fn is_dir_included(&self, dir: impl AsRef<HgPath>) -> bool {
match &self.only_include {
None => false,
Some(i) => i.contains(dir.as_ref()),
}
}
pub fn get(
&self,
path: impl AsRef<HgPath>,
) -> Option<&HashSet<&'a HgPath>> {
self.inner.get(path.as_ref())
}
}
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 #[cfg(test)]
mod tests {
use super::*;
Simon Sapin
dirstate-tree: Make Rust DirstateMap bindings go through a trait object...
r47863 use crate::StateMap;
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
#[test]
fn test_delete_path_path_not_found() {
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 let manifest: Vec<HgPathBuf> = vec![];
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 let mut map = DirsMultiset::from_manifest(&manifest).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 let path = HgPathBuf::from_bytes(b"doesnotexist/");
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 assert_eq!(
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 Err(DirstateMapError::PathNotFound(path.to_owned())),
map.delete_path(&path)
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 );
}
#[test]
fn test_delete_path_empty_path() {
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 let mut map =
DirsMultiset::from_manifest(&vec![HgPathBuf::new()]).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 let path = HgPath::new(b"");
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 assert_eq!(Ok(()), map.delete_path(path));
assert_eq!(
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 Err(DirstateMapError::PathNotFound(path.to_owned())),
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 map.delete_path(path)
);
}
#[test]
fn test_delete_path_successful() {
let mut map = DirsMultiset {
inner: [("", 5), ("a", 3), ("a/b", 2), ("a/c", 1)]
.iter()
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .collect(),
};
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(Ok(()), map.delete_path(HgPath::new(b"a/b/")));
eprintln!("{:?}", map);
assert_eq!(Ok(()), map.delete_path(HgPath::new(b"a/b/")));
eprintln!("{:?}", map);
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 assert_eq!(
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 Err(DirstateMapError::PathNotFound(HgPathBuf::from_bytes(
b"a/b/"
))),
map.delete_path(HgPath::new(b"a/b/"))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 );
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(2, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(1, *map.inner.get(HgPath::new(b"a/c")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 eprintln!("{:?}", map);
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(Ok(()), map.delete_path(HgPath::new(b"a/")));
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 eprintln!("{:?}", map);
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(Ok(()), map.delete_path(HgPath::new(b"a/c/")));
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 assert_eq!(
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 Err(DirstateMapError::PathNotFound(HgPathBuf::from_bytes(
b"a/c/"
))),
map.delete_path(HgPath::new(b"a/c/"))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 );
}
#[test]
fn test_add_path_empty_path() {
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 let manifest: Vec<HgPathBuf> = vec![];
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 let mut map = DirsMultiset::from_manifest(&manifest).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 let path = HgPath::new(b"");
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(path).unwrap();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
assert_eq!(1, map.len());
}
#[test]
fn test_add_path_successful() {
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 let manifest: Vec<HgPathBuf> = vec![];
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 let mut map = DirsMultiset::from_manifest(&manifest).unwrap();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(HgPath::new(b"a/")).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(1, *map.inner.get(HgPath::new(b"")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 assert_eq!(2, map.len());
// Non directory should be ignored
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(HgPath::new(b"a")).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 assert_eq!(2, map.len());
// Non directory will still add its base
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(HgPath::new(b"a/b")).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(2, *map.inner.get(HgPath::new(b"a")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 assert_eq!(2, map.len());
// Duplicate path works
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(HgPath::new(b"a/")).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(3, *map.inner.get(HgPath::new(b"a")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
// Nested dir adds to its base
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(HgPath::new(b"a/b/")).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(4, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(1, *map.inner.get(HgPath::new(b"a/b")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
// but not its base's base, because it already existed
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(HgPath::new(b"a/b/c/")).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(4, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(2, *map.inner.get(HgPath::new(b"a/b")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
Raphaël Gomès
rust-warnings: fix warnings in tests...
r44342 map.add_path(HgPath::new(b"a/c/")).unwrap();
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 assert_eq!(1, *map.inner.get(HgPath::new(b"a/c")).unwrap());
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
let expected = DirsMultiset {
inner: [("", 2), ("a", 5), ("a/b", 2), ("a/b/c", 1), ("a/c", 1)]
.iter()
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .collect(),
};
assert_eq!(map, expected);
}
#[test]
fn test_dirsmultiset_new_empty() {
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 let manifest: Vec<HgPathBuf> = vec![];
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 let new = DirsMultiset::from_manifest(&manifest).unwrap();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 inner: FastHashMap::default(),
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 };
assert_eq!(expected, new);
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 let new = DirsMultiset::from_dirstate(
StateMap::default().into_iter().map(Ok),
None,
)
.unwrap();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
Raphaël Gomès
rust-performance: introduce FastHashMap type alias for HashMap...
r44278 inner: FastHashMap::default(),
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 };
assert_eq!(expected, new);
}
#[test]
fn test_dirsmultiset_new_no_skip() {
Raphaël Gomès
rust-dirs-multiset: use `AsRef` instead of concrete types when possible...
r44283 let input_vec: Vec<HgPathBuf> = ["a/", "b/", "a/c", "a/d/"]
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .iter()
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 .map(|e| HgPathBuf::from_bytes(e.as_bytes()))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .collect();
let expected_inner = [("", 2), ("a", 3), ("b", 1), ("a/d", 1)]
.iter()
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .collect();
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 let new = DirsMultiset::from_manifest(&input_vec).unwrap();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
inner: expected_inner,
};
assert_eq!(expected, new);
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 let input_map = ["b/x", "a/c", "a/d/x"].iter().map(|f| {
Ok((
HgPathBuf::from_bytes(f.as_bytes()),
DirstateEntry {
state: EntryState::Normal,
mode: 0,
mtime: 0,
size: 0,
},
))
});
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 let expected_inner = [("", 2), ("a", 2), ("b", 1), ("a/d", 1)]
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .iter()
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .collect();
Simon Sapin
rust: Return owned instead of borrowed DirstateEntry in DirstateMap APIs...
r48123 let new = DirsMultiset::from_dirstate(input_map, None).unwrap();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
inner: expected_inner,
};
assert_eq!(expected, new);
}
#[test]
fn test_dirsmultiset_new_skip() {
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 let input_map = [
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 ("a/", EntryState::Normal),
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 ("a/b", EntryState::Normal),
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 ("a/c", EntryState::Removed),
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 ("a/d", EntryState::Merged),
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 ]
.iter()
.map(|(f, state)| {
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 Ok((
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 HgPathBuf::from_bytes(f.as_bytes()),
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 DirstateEntry {
state: *state,
mode: 0,
mtime: 0,
size: 0,
},
Simon Sapin
dirstate-v2: Make more APIs fallible, returning Result...
r48126 ))
});
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
// "a" incremented with "a/c" and "a/d/"
Raphaël Gomès
rust: start plugging the dirstate tree behind a feature gate...
r46185 let expected_inner = [("", 1), ("a", 2)]
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .iter()
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v))
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 .collect();
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 let new =
Simon Sapin
rust: Return owned instead of borrowed DirstateEntry in DirstateMap APIs...
r48123 DirsMultiset::from_dirstate(input_map, Some(EntryState::Normal))
Raphaël Gomès
rust-dirs: handle forgotten `Result`s...
r44315 .unwrap();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
inner: expected_inner,
};
assert_eq!(expected, new);
}
}