##// END OF EJS Templates
py3: avoid iterating over a literal bytes in highlight...
py3: avoid iterating over a literal bytes in highlight In Python 3, iterating over a bytes literal yields integers. Since we use the value in `text.replace()`, this fails on Python 3 with the following trackback: Traceback (most recent call last): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgwebdir_mod.py", line 378, in run_wsgi for r in self._runwsgi(req, res): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 326, in run_wsgi for r in self._runwsgi(req, res, repo): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 449, in _runwsgi return getattr(webcommands, cmd)(rctx) File "/usr/lib/python3/dist-packages/mercurial/hgweb/webcommands.py", line 211, in file return _filerevision(web, webutil.filectx(web.repo, web.req)) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 72, in filerevision_highlight pygmentize(web, b'fileline', fctx, web.tmpl) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 58, in pygmentize field, fctx, style, tmpl, guessfilenameonly=filenameonly File "/usr/lib/python3/dist-packages/hgext/highlight/highlight.py", line 62, in pygmentize text = text.replace(c, b'') TypeError: a bytes-like object is required, not 'int'

File last commit:

r43227:7a01778b default
r44014:856cce0c stable
Show More
dirs_multiset.rs
329 lines | 10.0 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.
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 use crate::utils::hg_path::{HgPath, HgPathBuf};
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 use crate::{
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 dirstate::EntryState, utils::files, DirstateEntry, DirstateMapError,
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 };
Yuya Nishihara
rust-dirstate: specify concrete return type of DirsMultiset::iter()...
r43155 use std::collections::hash_map::{self, Entry};
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 use std::collections::HashMap;
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 inner: HashMap<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.
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 pub fn from_dirstate(
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 vec: &HashMap<HgPathBuf, DirstateEntry>,
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 skip_state: Option<EntryState>,
) -> Self {
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let mut multiset = DirsMultiset {
inner: HashMap::new(),
};
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 for (filename, DirstateEntry { state, .. }) in vec {
// This `if` is optimized out of the loop
if let Some(skip) = skip_state {
if skip != *state {
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 multiset.add_path(filename);
}
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 } else {
multiset.add_path(filename);
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 }
}
multiset
}
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 /// Initializes the multiset from a manifest.
Raphaël Gomès
rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 pub fn from_manifest(vec: &Vec<HgPathBuf>) -> Self {
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let mut multiset = DirsMultiset {
inner: HashMap::new(),
};
for filename in vec {
multiset.add_path(filename);
}
multiset
}
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 pub fn add_path(&mut self, path: &HgPath) {
Raphaël Gomès
rust-utils: use new find_dirs iterator...
r42814 for subpath in files::find_dirs(path) {
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);
}
}
/// 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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 path: &HgPath,
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 ) -> Result<(), DirstateMapError> {
Raphaël Gomès
rust-utils: use new find_dirs iterator...
r42814 for subpath in files::find_dirs(path) {
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 match self.inner.entry(subpath.to_owned()) {
Entry::Occupied(mut entry) => {
let val = entry.get().clone();
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(
path.to_owned(),
))
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 pub fn contains(&self, key: &HgPath) -> bool {
Raphaël Gomès
rust: remove Deref in favor of explicit methods...
r42762 self.inner.contains_key(key)
}
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-dirstate: add "dirs" Rust implementation...
r42736 }
#[cfg(test)]
mod tests {
use super::*;
Raphaël Gomès
rust-parsers: switch to parse/pack_dirstate to mutate-on-loop...
r42993 use std::collections::HashMap;
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
#[test]
fn test_delete_path_path_not_found() {
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let mut map = DirsMultiset::from_manifest(&vec![]);
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 let mut map = DirsMultiset::from_manifest(&vec![HgPathBuf::new()]);
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() {
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let mut map = DirsMultiset::from_manifest(&vec![]);
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 map.add_path(path);
assert_eq!(1, map.len());
}
#[test]
fn test_add_path_successful() {
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let mut map = DirsMultiset::from_manifest(&vec![]);
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 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"")).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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 map.add_path(HgPath::new(b"a"));
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 map.add_path(HgPath::new(b"a/b"));
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 map.add_path(HgPath::new(b"a/"));
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 map.add_path(HgPath::new(b"a/b/"));
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 map.add_path(HgPath::new(b"a/b/c/"));
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-hgpath: replace all paths and filenames with HgPath/HgPathBuf...
r43227 map.add_path(HgPath::new(b"a/c/"));
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() {
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let new = DirsMultiset::from_manifest(&vec![]);
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
inner: HashMap::new(),
};
assert_eq!(expected, new);
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let new = DirsMultiset::from_dirstate(&HashMap::new(), None);
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
inner: HashMap::new(),
};
assert_eq!(expected, new);
}
#[test]
fn test_dirsmultiset_new_no_skip() {
let input_vec = ["a/", "b/", "a/c", "a/d/"]
.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();
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let new = DirsMultiset::from_manifest(&input_vec);
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
inner: expected_inner,
};
assert_eq!(expected, new);
let input_map = ["a/", "b/", "a/c", "a/d/"]
.iter()
.map(|f| {
(
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: add "dirs" Rust implementation...
r42736 DirstateEntry {
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 state: EntryState::Normal,
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 mode: 0,
mtime: 0,
size: 0,
},
)
})
.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();
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 let new = DirsMultiset::from_dirstate(&input_map, None);
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() {
Raphaël Gomès
rust-dirstate: use EntryState enum instead of literals...
r42994 let input_map = [
("a/", EntryState::Normal),
("a/b/", EntryState::Normal),
("a/c", EntryState::Removed),
("a/d/", EntryState::Merged),
]
.iter()
.map(|(f, state)| {
(
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,
},
)
})
.collect();
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736
// "a" incremented with "a/c" and "a/d/"
let expected_inner = [("", 1), ("a", 2), ("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-dirstate: use EntryState enum instead of literals...
r42994 let new =
Yuya Nishihara
rust-dirstate: split DirsMultiset constructor per input type...
r43070 DirsMultiset::from_dirstate(&input_map, Some(EntryState::Normal));
Raphaël Gomès
rust-dirstate: add "dirs" Rust implementation...
r42736 let expected = DirsMultiset {
inner: expected_inner,
};
assert_eq!(expected, new);
}
}