mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-28 15:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

working_copy: use tree rather than file states to detect if directory is tracked

Browse source 
This moves us closer towards treating the `file_states` map as purely a cache rather than authoritative state.
This commit is contained in:
Waleed Khan 2023-06-23 12:40:41 -07:00 committed by Martin von Zweigbergk
parent 9d8702b537
commit 4b635e9713
1 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/src/working_copy.rs
View file

@ -20,7 +20,6 @@ use std::ffi::OsString;
use std::fs; use std::fs;
use std::fs::{DirEntry, File, Metadata, OpenOptions}; use std::fs::{DirEntry, File, Metadata, OpenOptions};
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::ops::Bound;
#[cfg(unix)] #[cfg(unix)]
use std::os::unix::fs::symlink; use std::os::unix::fs::symlink;
#[cfg(unix)] #[cfg(unix)]
@ -677,7 +676,7 @@ impl TreeState {
// If the whole directory is ignored, skip it unless we're already tracking // If the whole directory is ignored, skip it unless we're already tracking
// some file in it. // some file in it.
if git_ignore.matches_all_files_in(&sub_path.to_internal_dir_string()) if git_ignore.matches_all_files_in(&sub_path.to_internal_dir_string())
&& !self.has_files_under(&sub_path) && current_tree.path_value(&sub_path).is_none()
{ {
continue; continue;
} }
@ -789,25 +788,6 @@ impl TreeState {
}) })
} }
fn has_files_under(&self, dir: &RepoPath) -> bool {
// TODO: This is pretty ugly... Also, we should
// optimize it to check exactly the already-tracked files (we know that
// we won't have to consider new files in the directory).
let first_file_in_dir = dir.join(&RepoPathComponent::from("\0"));
match self
.file_states
.range((Bound::Included(&first_file_in_dir), Bound::Unbounded))
.next()
{
Some((subdir_file, _)) => dir.contains(subdir_file),
None => {
// There are no tracked paths at all after `dir/` in alphabetical order, so
// there are no paths under `dir/`.
false
}
}
}
fn get_updated_file_state( fn get_updated_file_state(
&self, &self,
repo_path: &RepoPath, repo_path: &RepoPath,