mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

working_copy: take advantage of DirEntry::path()

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-11-03 08:55:59 -07:00 committed by Martin von Zweigbergk
parent 5dce6e9884
commit f86ffbd47b
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/src/working_copy.rs
View file

@ -333,10 +333,9 @@ impl TreeState {
}
}
}
let disk_subdir = disk_dir.join(file_name);
work.push((sub_path, disk_subdir, git_ignore.clone()));
work.push((sub_path, entry.path(), git_ignore.clone()));
} else {
let disk_file = disk_dir.join(file_name);
let disk_file = entry.path();
deleted_files.remove(&sub_path);
let current_file_state = self.file_states.get(&sub_path);
if current_file_state.is_none()
@ -346,7 +345,7 @@ impl TreeState {
// ignore it.
continue;
}
let new_file_state = self.file_state(&entry.path()).unwrap();
let new_file_state = self.file_state(&disk_file).unwrap();
let clean;
let executable;
match current_file_state {