hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-22 21:41:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enhance index change detection in collect_index_worktree_changes function

Browse source 
- Introduced a mechanism to capture the last modification time of the index, allowing for more accurate detection of changes between the index and the working tree.
- Updated the logic to track untracked files based on size comparison and modification time, improving the reliability of change detection.
- Refactored the `git_init` function to streamline repository initialization and configuration setup.

These changes aim to improve the accuracy and efficiency of index change detection within the git repository.
This commit is contained in:
Joe 2026-03-01 14:31:50 -06:00
parent 7b17d3d55e
commit a4042d3d97
1 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/git.rs
View file

@ -264,6 +264,15 @@ fn collect_index_worktree_changes(
}; };
let stat_options: gix::index::entry::stat::Options = Default::default(); let stat_options: gix::index::entry::stat::Options = Default::default();
let index_mtime_secs = std::fs::metadata(repo.index_path())
.ok()
.and_then(|m| m.modified().ok())
.map(|t| {
t.duration_since(std::time::UNIX_EPOCH)
.unwrap_or_default()
.as_secs() as u32
})
.unwrap_or(u32::MAX);
for entry in index.entries() { for entry in index.entries() {
let path_bstr = entry.path(index); let path_bstr = entry.path(index);
@ -273,7 +282,12 @@ fn collect_index_worktree_changes(
match gix::index::fs::Metadata::from_path_no_follow(&full_path) { match gix::index::fs::Metadata::from_path_no_follow(&full_path) {
Ok(fs_meta) => { Ok(fs_meta) => {
if let Ok(fs_stat) = gix::index::entry::Stat::from_fs(&fs_meta) { if let Ok(fs_stat) = gix::index::entry::Stat::from_fs(&fs_meta) {
if entry.stat.matches(&fs_stat, stat_options) { if fs_stat.size != entry.stat.size {
tracked.insert(PathBuf::from(path_str.as_ref()));
continue;
}
let not_racy = entry.stat.mtime.secs < index_mtime_secs;
if not_racy && entry.stat.matches(&fs_stat, stat_options) {
continue; continue;
} }
} }
@ -1008,17 +1022,11 @@ mod tests {
use tempfile::tempdir; use tempfile::tempdir;
fn git_init(dir: &Path) { fn git_init(dir: &Path) {
let mut repo = gix::init(dir).expect("gix init failed"); gix::init(dir).expect("gix init failed");
{ let config_path = dir.join(".git/config");
let mut config = repo.config_snapshot_mut(); let mut content = fs::read_to_string(&config_path).unwrap_or_default();
config content.push_str("[user]\n\tname = Test\n\temail = test@test.com\n");
.set_raw_value(&gix::config::tree::User::NAME, "Test") fs::write(&config_path, content).unwrap();
.unwrap();
config
.set_raw_value(&gix::config::tree::User::EMAIL, "test@test.com")
.unwrap();
let _ = config.commit_auto_rollback().unwrap();
}
} }
fn git_commit_all(dir: &Path, msg: &str) { fn git_commit_all(dir: &Path, msg: &str) {