diff -r cae0be933434 -r 2a89d2f6336f rust/hg-core/src/filepatterns.rs --- a/rust/hg-core/src/filepatterns.rs Fri Apr 12 14:17:10 2024 +0100 +++ b/rust/hg-core/src/filepatterns.rs Fri Apr 12 14:21:14 2024 +0100 @@ -57,7 +57,7 @@ RelRegexp, /// A path relative to repository root, which is matched non-recursively /// (will not match subdirectories) - RootFiles, + RootFilesIn, /// A file of patterns to read and include Include, /// A file of patterns to match against files under the same directory @@ -158,7 +158,7 @@ b"path:" => Ok(PatternSyntax::Path), b"filepath:" => Ok(PatternSyntax::FilePath), b"relpath:" => Ok(PatternSyntax::RelPath), - b"rootfilesin:" => Ok(PatternSyntax::RootFiles), + b"rootfilesin:" => Ok(PatternSyntax::RootFilesIn), b"relglob:" => Ok(PatternSyntax::RelGlob), b"relre:" => Ok(PatternSyntax::RelRegexp), b"glob:" => Ok(PatternSyntax::Glob), @@ -227,7 +227,7 @@ } [escape_pattern(pattern).as_slice(), b"(?:/|$)"].concat() } - PatternSyntax::RootFiles => { + PatternSyntax::RootFilesIn => { let mut res = if pattern == b"." { vec![] } else { @@ -316,7 +316,7 @@ | PatternSyntax::Path | PatternSyntax::RelGlob | PatternSyntax::RelPath - | PatternSyntax::RootFiles => normalize_path_bytes(pattern), + | PatternSyntax::RootFilesIn => normalize_path_bytes(pattern), PatternSyntax::Include | PatternSyntax::SubInclude => { return Err(PatternError::NonRegexPattern(entry.clone())) } @@ -342,7 +342,7 @@ m.insert(b"path:".as_ref(), PatternSyntax::Path); m.insert(b"filepath:".as_ref(), PatternSyntax::FilePath); m.insert(b"relpath:".as_ref(), PatternSyntax::RelPath); - m.insert(b"rootfilesin:".as_ref(), PatternSyntax::RootFiles); + m.insert(b"rootfilesin:".as_ref(), PatternSyntax::RootFilesIn); m.insert(b"relglob:".as_ref(), PatternSyntax::RelGlob); m.insert(b"relre:".as_ref(), PatternSyntax::RelRegexp); m.insert(b"glob:".as_ref(), PatternSyntax::Glob); @@ -385,7 +385,7 @@ | PatternSyntax::Glob | PatternSyntax::RelGlob | PatternSyntax::RelPath - | PatternSyntax::RootFiles + | PatternSyntax::RootFilesIn if normalize => { normalize_path_bytes(pattern_bytes)