##// END OF EJS Templates
revlog: make `clearcaches()` signature consistent with ManifestRevlog...
revlog: make `clearcaches()` signature consistent with ManifestRevlog I'm not sure if this a newly added bug, because of using a different version of pytype, or if the recent work around avoiding the zope interface types in the type checking phase (see 5eb98ea78fd7 and friends)... but pytype 2023.11.21 started flagging this series since it was last pushed ~6 weeks ago: File "/mnt/c/Users/Matt/hg/mercurial/bundlerepo.py", line 204, in <module>: Overriding method signature mismatch [signature-mismatch] Base signature: 'def mercurial.manifest.ManifestRevlog.clearcaches(self, clear_persisted_data: Any = ...) -> None'. Subclass signature: 'def mercurial.revlog.revlog.clearcaches(self) -> None'. Not enough positional parameters in overriding method. Maybe the multiple inheritance in `bundlerepo.bundlemanifest` is bad, but it seems like a `ManifestRevlog` is-a `revlog`, even though the class hierarchy isn't coded that way. Additionally, it looks like `revlog.clearcaches()` is dealing with some persistent data, so maybe this is useful to have there anyway. Also sprinkle some trivial type hints on the method, because there are other `clearcaches()` definitions in the codebase with these hints, and I don't feel like waiting for another pytype run to see if it cares that specifically about the signature matching.

File last commit:

r51750:796b5d66 default
r52765:5e79783d default
Show More
narrow.rs
115 lines | 3.6 KiB | application/rls-services+xml | RustLexer
use std::path::Path;
use crate::{
errors::HgError,
exit_codes,
filepatterns::parse_pattern_file_contents,
matchers::{
AlwaysMatcher, DifferenceMatcher, IncludeMatcher, Matcher,
NeverMatcher,
},
repo::Repo,
requirements::NARROW_REQUIREMENT,
sparse::{self, SparseConfigError, SparseWarning},
};
/// The file in .hg/store/ that indicates which paths exit in the store
const FILENAME: &str = "narrowspec";
/// The file in .hg/ that indicates which paths exit in the dirstate
const DIRSTATE_FILENAME: &str = "narrowspec.dirstate";
/// Pattern prefixes that are allowed in narrow patterns. This list MUST
/// only contain patterns that are fast and safe to evaluate. Keep in mind
/// that patterns are supplied by clients and executed on remote servers
/// as part of wire protocol commands. That means that changes to this
/// data structure influence the wire protocol and should not be taken
/// lightly - especially removals.
const VALID_PREFIXES: [&str; 2] = ["path:", "rootfilesin:"];
/// Return the matcher for the current narrow spec, and all configuration
/// warnings to display.
pub fn matcher(
repo: &Repo,
) -> Result<(Box<dyn Matcher + Sync>, Vec<SparseWarning>), SparseConfigError> {
let mut warnings = vec![];
if !repo.requirements().contains(NARROW_REQUIREMENT) {
return Ok((Box::new(AlwaysMatcher), warnings));
}
// Treat "narrowspec does not exist" the same as "narrowspec file exists
// and is empty".
let store_spec = repo.store_vfs().try_read(FILENAME)?.unwrap_or_default();
let working_copy_spec = repo
.hg_vfs()
.try_read(DIRSTATE_FILENAME)?
.unwrap_or_default();
if store_spec != working_copy_spec {
return Err(HgError::abort(
"abort: working copy's narrowspec is stale",
exit_codes::STATE_ERROR,
Some("run 'hg tracked --update-working-copy'".into()),
)
.into());
}
let config = sparse::parse_config(
&store_spec,
sparse::SparseConfigContext::Narrow,
)?;
warnings.extend(config.warnings);
if !config.profiles.is_empty() {
// TODO (from Python impl) maybe do something with profiles?
return Err(SparseConfigError::IncludesInNarrow);
}
validate_patterns(&config.includes)?;
validate_patterns(&config.excludes)?;
if config.includes.is_empty() {
return Ok((Box::new(NeverMatcher), warnings));
}
let (patterns, subwarnings) = parse_pattern_file_contents(
&config.includes,
Path::new(""),
None,
false,
true,
)?;
warnings.extend(subwarnings.into_iter().map(From::from));
let mut m: Box<dyn Matcher + Sync> =
Box::new(IncludeMatcher::new(patterns)?);
let (patterns, subwarnings) = parse_pattern_file_contents(
&config.excludes,
Path::new(""),
None,
false,
true,
)?;
if !patterns.is_empty() {
warnings.extend(subwarnings.into_iter().map(From::from));
let exclude_matcher = Box::new(IncludeMatcher::new(patterns)?);
m = Box::new(DifferenceMatcher::new(m, exclude_matcher));
}
Ok((m, warnings))
}
fn validate_patterns(patterns: &[u8]) -> Result<(), SparseConfigError> {
for pattern in patterns.split(|c| *c == b'\n') {
if pattern.is_empty() {
continue;
}
for prefix in VALID_PREFIXES.iter() {
if pattern.starts_with(prefix.as_bytes()) {
return Ok(());
}
}
return Err(SparseConfigError::InvalidNarrowPrefix(
pattern.to_owned(),
));
}
Ok(())
}