##// END OF EJS Templates
hgweb: skip logging ConnectionAbortedError...
hgweb: skip logging ConnectionAbortedError Not stacktracing on `ConnectionResetError` was added in 6bbb12cba5a8 (though it was spelled differently for py2 support), but for some reason Windows occasionally triggers a `ConnectionAbortedError` here across various *.t files (notably `test-archive.t` and `test-lfs-serve-access.t`, but there are others). The payload that fails to send seems to be the html that describes the error to the client, so I suspect some code is seeing the error status code and closing the connection before the server gets to write this html. So don't log it, for test stability- nothing we can do anyway. FWIW, the CPython implementation of wsgihander specifically ignores these two errors, plus `BrokenPipeError`, with a comment that "we expect the client to close the connection abruptly from time to time"[1]. The `BrokenPipeError` is swallowed a level up in `do_write()`, and avoids writing the response following this stacktrace. I'm puzzled why a response is being written after these connection errors are detected- the CPython code referenced doesn't, and the connection is now broken at this point. Perhaps these errors should both be handled with the `BrokenPipeError` after the freeze. (The refactoring away from py2 compat may not be desireable in the freeze, but this is much easier to read, and obviously correct given the referenced CPython code.) I suspect this is what 6bceecb28806 was attempting to fix, but it wasn't specific about the sporadic errors it was seeing. [1] https://github.com/python/cpython/blob/b2eaa75b176e07730215d76d8dce4d63fb493391/Lib/wsgiref/handlers.py#L139

File last commit:

r52936:ae1ab6d7 default
r53050:891f6d56 stable
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.
pub 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(())
}