mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-25 16:09:56 +00:00
88f7f4732b
This is to address issue #8. I haven't added the optimization to avoid walking all the files in `target/` yet. Even so, this patch still speeds up `jj st` in this repo, with ~13k files in `target/`, from ~320 ms to ~100 ms (-5.1dB). The time actually checking if paths match gitignores seems to go down from 116 ms to 6 ms. I think that's mostly because libgit2 has to look for `.gitignore` files in every parent directory every time we ask it about a file, while the rewritten code looks for a `.gitignore` file only when visiting a new directory.
414 lines
14 KiB
Rust
414 lines
14 KiB
Rust
// Copyright 2021 Google LLC
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use regex::{escape as regex_escape, Regex};
|
|
|
|
pub enum GitIgnoreParseError {}
|
|
|
|
struct GitIgnoreLine {
|
|
is_negative: bool,
|
|
regex: Regex,
|
|
}
|
|
|
|
impl GitIgnoreLine {
|
|
// Remove trailing spaces (unless backslash-escaped)
|
|
fn remove_trailing_space(input: &str) -> &str {
|
|
let mut trimmed_len = 0;
|
|
let mut non_space_seen = false;
|
|
let mut prev_was_space = false;
|
|
let mut in_escape = false;
|
|
for (i, c) in input.char_indices() {
|
|
if !prev_was_space && non_space_seen {
|
|
trimmed_len = i;
|
|
}
|
|
if c == ' ' {
|
|
if in_escape {
|
|
in_escape = false;
|
|
} else {
|
|
prev_was_space = true;
|
|
}
|
|
} else {
|
|
non_space_seen = true;
|
|
prev_was_space = false;
|
|
in_escape = c == '\\'
|
|
}
|
|
}
|
|
if !prev_was_space && non_space_seen {
|
|
trimmed_len = input.len();
|
|
}
|
|
&input.split_at(trimmed_len).0
|
|
}
|
|
|
|
fn parse(prefix: &str, input: &str) -> Result<Option<GitIgnoreLine>, GitIgnoreParseError> {
|
|
if input.starts_with('#') {
|
|
return Ok(None);
|
|
}
|
|
|
|
let input = GitIgnoreLine::remove_trailing_space(input);
|
|
// Remove leading "!" before checking for empty to match git's implementation
|
|
// (i.e. just "!" matching nothing, not everything).
|
|
let (is_negative, input) = match input.strip_prefix('!') {
|
|
None => (false, input),
|
|
Some(rest) => (true, rest),
|
|
};
|
|
if input.is_empty() {
|
|
return Ok(None);
|
|
}
|
|
|
|
let (matches_only_directory, input) = match input.strip_suffix('/') {
|
|
None => (false, input),
|
|
Some(rest) => (true, rest),
|
|
};
|
|
let (mut is_rooted, input) = match input.strip_prefix('/') {
|
|
None => (false, input),
|
|
Some(rest) => (true, rest),
|
|
};
|
|
is_rooted |= input.contains('/');
|
|
|
|
let mut regex = String::new();
|
|
if is_rooted {
|
|
regex.insert_str(0, prefix);
|
|
regex.insert(0, '^');
|
|
} else {
|
|
regex.insert_str(0, "(^|/)");
|
|
}
|
|
|
|
let components: Vec<_> = input.split('/').collect();
|
|
for (i, component) in components.iter().enumerate() {
|
|
if *component == "**" {
|
|
if i == components.len() - 1 {
|
|
regex.push_str(".*");
|
|
} else {
|
|
regex.push_str("(.*/)?");
|
|
}
|
|
} else {
|
|
let mut in_escape = false;
|
|
let mut character_class: Option<String> = None;
|
|
for c in component.chars() {
|
|
if in_escape {
|
|
in_escape = false;
|
|
if !matches!(c, ' ' | '#' | '!' | '?' | '\\' | '*') {
|
|
regex.push_str(®ex_escape("\\"));
|
|
}
|
|
regex.push_str(®ex_escape(&c.to_string()));
|
|
} else if c == '\\' {
|
|
in_escape = true;
|
|
} else if let Some(characters) = &mut character_class {
|
|
if c == ']' {
|
|
regex.push('[');
|
|
regex.push_str(&characters);
|
|
regex.push(']');
|
|
character_class = None;
|
|
} else {
|
|
characters.push(c);
|
|
}
|
|
} else {
|
|
in_escape = false;
|
|
if c == '?' {
|
|
regex.push_str("[^/]");
|
|
} else if c == '*' {
|
|
regex.push_str("[^/]*");
|
|
} else if c == '[' {
|
|
character_class = Some(String::new());
|
|
} else {
|
|
regex.push_str(®ex_escape(&c.to_string()));
|
|
}
|
|
}
|
|
}
|
|
if in_escape {
|
|
regex.push_str(®ex_escape("\\"));
|
|
}
|
|
if i < components.len() - 1 {
|
|
regex.push('/');
|
|
}
|
|
}
|
|
}
|
|
if matches_only_directory {
|
|
regex.push_str("/.*");
|
|
} else {
|
|
regex.push_str("(/.*|$)");
|
|
}
|
|
let regex = Regex::new(®ex).unwrap();
|
|
|
|
Ok(Some(GitIgnoreLine { is_negative, regex }))
|
|
}
|
|
|
|
fn matches_file(&self, path: &str) -> bool {
|
|
self.regex.is_match(path)
|
|
}
|
|
}
|
|
|
|
pub struct GitIgnoreFile {
|
|
parent: Option<Arc<GitIgnoreFile>>,
|
|
lines: Vec<GitIgnoreLine>,
|
|
}
|
|
|
|
impl GitIgnoreFile {
|
|
pub fn empty() -> Arc<GitIgnoreFile> {
|
|
Arc::new(GitIgnoreFile {
|
|
parent: None,
|
|
lines: vec![],
|
|
})
|
|
}
|
|
|
|
pub fn chain(
|
|
self: &Arc<GitIgnoreFile>,
|
|
prefix: &str,
|
|
input: &[u8],
|
|
) -> Result<Arc<GitIgnoreFile>, GitIgnoreParseError> {
|
|
let mut lines = vec![];
|
|
for input_line in input.split(|b| *b == b'\n') {
|
|
// Skip non-utf8 lines
|
|
if let Ok(line_string) = String::from_utf8(input_line.to_vec()) {
|
|
if let Some(line) = GitIgnoreLine::parse(prefix, &line_string)? {
|
|
lines.push(line);
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(Arc::new(GitIgnoreFile {
|
|
parent: Some(self.clone()),
|
|
lines,
|
|
}))
|
|
}
|
|
|
|
fn all_lines_reversed<'a>(&'a self) -> Box<dyn Iterator<Item = &GitIgnoreLine> + 'a> {
|
|
if let Some(parent) = &self.parent {
|
|
Box::new(self.lines.iter().rev().chain(parent.all_lines_reversed()))
|
|
} else {
|
|
Box::new(self.lines.iter().rev())
|
|
}
|
|
}
|
|
|
|
pub fn matches_file(&self, path: &str) -> bool {
|
|
// Later lines take precedence, so check them in reverse
|
|
for line in self.all_lines_reversed() {
|
|
if line.matches_file(path) {
|
|
return !line.is_negative;
|
|
}
|
|
}
|
|
false
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
fn matches_file(input: &[u8], path: &str) -> bool {
|
|
let file = GitIgnoreFile::empty().chain("", input).ok().unwrap();
|
|
file.matches_file(path)
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_empty_file() {
|
|
let file = GitIgnoreFile::empty();
|
|
assert!(!file.matches_file("foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_empty_file_with_prefix() {
|
|
let file = GitIgnoreFile::empty().chain("dir/", b"").ok().unwrap();
|
|
assert!(!file.matches_file("dir/foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_literal() {
|
|
let file = GitIgnoreFile::empty().chain("", b"foo\n").ok().unwrap();
|
|
assert!(file.matches_file("foo"));
|
|
assert!(file.matches_file("dir/foo"));
|
|
assert!(file.matches_file("dir/subdir/foo"));
|
|
assert!(!file.matches_file("food"));
|
|
assert!(!file.matches_file("dir/food"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_literal_with_prefix() {
|
|
let file = GitIgnoreFile::empty().chain("dir/", b"foo\n").ok().unwrap();
|
|
// I consider it undefined whether a file in a parent directory matches, but
|
|
// let's test it anyway
|
|
assert!(file.matches_file("foo"));
|
|
assert!(file.matches_file("dir/foo"));
|
|
assert!(file.matches_file("dir/subdir/foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_rooted_literal() {
|
|
let file = GitIgnoreFile::empty().chain("", b"/foo\n").ok().unwrap();
|
|
assert!(file.matches_file("foo"));
|
|
assert!(!file.matches_file("dir/foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_rooted_literal_with_prefix() {
|
|
let file = GitIgnoreFile::empty()
|
|
.chain("dir/", b"/foo\n")
|
|
.ok()
|
|
.unwrap();
|
|
// I consider it undefined whether a file in a parent directory matches, but
|
|
// let's test it anyway
|
|
assert!(!file.matches_file("foo"));
|
|
assert!(file.matches_file("dir/foo"));
|
|
assert!(!file.matches_file("dir/subdir/foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_deep_dir() {
|
|
let file = GitIgnoreFile::empty()
|
|
.chain("", b"/dir1/dir2/dir3\n")
|
|
.ok()
|
|
.unwrap();
|
|
assert!(!file.matches_file("foo"));
|
|
assert!(!file.matches_file("dir1/foo"));
|
|
assert!(!file.matches_file("dir1/dir2/foo"));
|
|
assert!(file.matches_file("dir1/dir2/dir3/foo"));
|
|
assert!(file.matches_file("dir1/dir2/dir3/dir4/foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_match_only_dir() {
|
|
let file = GitIgnoreFile::empty().chain("", b"/dir/\n").ok().unwrap();
|
|
assert!(!file.matches_file("dir"));
|
|
assert!(file.matches_file("dir/foo"));
|
|
assert!(file.matches_file("dir/subdir/foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_unusual_symbols() {
|
|
assert!(matches_file(b"\\*\n", "*"));
|
|
assert!(!matches_file(b"\\*\n", "foo"));
|
|
assert!(matches_file(b"\\\n", "\\"));
|
|
assert!(matches_file(b"\\!\n", "!"));
|
|
assert!(matches_file(b"\\?\n", "?"));
|
|
assert!(!matches_file(b"\\?\n", "x"));
|
|
// Invalid escapes are treated like literal backslashes
|
|
assert!(matches_file(b"\\w\n", "\\w"));
|
|
assert!(!matches_file(b"\\w\n", "w"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_whitespace() {
|
|
assert!(!matches_file(b" \n", " "));
|
|
assert!(matches_file(b"\\ \n", " "));
|
|
assert!(matches_file(b" a\n", " a"));
|
|
assert!(matches_file(b"a b\n", "a b"));
|
|
assert!(matches_file(b"a b \n", "a b"));
|
|
assert!(!matches_file(b"a b \n", "a b "));
|
|
assert!(matches_file(b"a b\\ \\ \n", "a b "));
|
|
// It's unclear how this should be interpreted, but we count spaces before
|
|
// escaped spaces
|
|
assert!(matches_file(b"a b \\ \n", "a b "));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_glob() {
|
|
assert!(!matches_file(b"*.o\n", "foo"));
|
|
assert!(matches_file(b"*.o\n", "foo.o"));
|
|
assert!(!matches_file(b"foo.?\n", "foo"));
|
|
assert!(!matches_file(b"foo.?\n", "foo."));
|
|
assert!(matches_file(b"foo.?\n", "foo.o"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_range() {
|
|
assert!(!matches_file(b"foo.[az]\n", "foo"));
|
|
assert!(matches_file(b"foo.[az]\n", "foo.a"));
|
|
assert!(!matches_file(b"foo.[az]\n", "foo.g"));
|
|
assert!(matches_file(b"foo.[az]\n", "foo.z"));
|
|
assert!(!matches_file(b"foo.[a-z]\n", "foo"));
|
|
assert!(matches_file(b"foo.[a-z]\n", "foo.a"));
|
|
assert!(matches_file(b"foo.[a-z]\n", "foo.g"));
|
|
assert!(matches_file(b"foo.[a-z]\n", "foo.z"));
|
|
assert!(matches_file(b"foo.[0-9a-fA-F]\n", "foo.5"));
|
|
assert!(matches_file(b"foo.[0-9a-fA-F]\n", "foo.c"));
|
|
assert!(matches_file(b"foo.[0-9a-fA-F]\n", "foo.E"));
|
|
assert!(!matches_file(b"foo.[0-9a-fA-F]\n", "foo._"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_leading_dir_glob() {
|
|
assert!(matches_file(b"**/foo\n", "foo"));
|
|
assert!(matches_file(b"**/foo\n", "dir1/dir2/foo"));
|
|
assert!(matches_file(b"**/foo\n", "foo/file"));
|
|
assert!(matches_file(b"**/dir/foo\n", "dir/foo"));
|
|
assert!(matches_file(b"**/dir/foo\n", "dir1/dir2/dir/foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_leading_dir_glob_with_prefix() {
|
|
let file = GitIgnoreFile::empty()
|
|
.chain("dir1/dir2/", b"**/foo\n")
|
|
.ok()
|
|
.unwrap();
|
|
// I consider it undefined whether a file in a parent directory matches, but
|
|
// let's test it anyway
|
|
assert!(!file.matches_file("foo"));
|
|
assert!(file.matches_file("dir1/dir2/foo"));
|
|
assert!(!file.matches_file("dir1/dir2/bar"));
|
|
assert!(file.matches_file("dir1/dir2/sub1/sub2/foo"));
|
|
assert!(!file.matches_file("dir1/dir2/sub1/sub2/bar"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_trailing_dir_glob() {
|
|
assert!(!matches_file(b"abc/**\n", "abc"));
|
|
assert!(matches_file(b"abc/**\n", "abc/file"));
|
|
assert!(matches_file(b"abc/**\n", "abc/dir/file"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_internal_dir_glob() {
|
|
assert!(matches_file(b"a/**/b\n", "a/b"));
|
|
assert!(matches_file(b"a/**/b\n", "a/x/b"));
|
|
assert!(matches_file(b"a/**/b\n", "a/x/y/b"));
|
|
assert!(!matches_file(b"a/**/b\n", "ax/y/b"));
|
|
assert!(!matches_file(b"a/**/b\n", "a/x/yb"));
|
|
assert!(!matches_file(b"a/**/b\n", "ab"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_internal_dir_glob_not_really() {
|
|
assert!(!matches_file(b"a/x**y/b\n", "a/b"));
|
|
assert!(matches_file(b"a/x**y/b\n", "a/xy/b"));
|
|
assert!(matches_file(b"a/x**y/b\n", "a/xzzzy/b"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_line_ordering() {
|
|
assert!(matches_file(b"foo\n!foo/bar\n", "foo"));
|
|
assert!(!matches_file(b"foo\n!foo/bar\n", "foo/bar"));
|
|
assert!(matches_file(b"foo\n!foo/bar\n", "foo/baz"));
|
|
assert!(matches_file(b"foo\n!foo/bar\nfoo/bar/baz", "foo"));
|
|
assert!(!matches_file(b"foo\n!foo/bar\nfoo/bar/baz", "foo/bar"));
|
|
assert!(matches_file(b"foo\n!foo/bar\nfoo/bar/baz", "foo/bar/baz"));
|
|
assert!(!matches_file(b"foo\n!foo/bar\nfoo/bar/baz", "foo/bar/quux"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_gitignore_file_ordering() {
|
|
let file1 = GitIgnoreFile::empty().chain("", b"foo\n").ok().unwrap();
|
|
let file2 = file1.chain("foo/", b"!bar").ok().unwrap();
|
|
let file3 = file2.chain("foo/bar/", b"baz").ok().unwrap();
|
|
assert!(file1.matches_file("foo"));
|
|
assert!(file1.matches_file("foo/bar"));
|
|
assert!(!file2.matches_file("foo/bar"));
|
|
assert!(file2.matches_file("foo/baz"));
|
|
assert!(file3.matches_file("foo/bar/baz"));
|
|
assert!(!file3.matches_file("foo/bar/qux"));
|
|
}
|
|
}
|