Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add statuses to test integration

Browse source
This commit is contained in:
Mikayla Maki 2023-06-05 12:06:23 -07:00
parent e56fcd69b5
commit 4ac5f7b14e
No known key found for this signature in database
3 changed files with 6 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/collab/src/db.rs
View file

@ -1537,8 +1537,7 @@ impl Database {
}),
is_symlink: db_entry.is_symlink,
is_ignored: db_entry.is_ignored,
// TODO stream statuses
git_status: None,
git_status: db_entry.git_status.map(|status| status as i32),
});
}
}
@ -2329,6 +2328,7 @@ impl Database {
mtime_nanos: ActiveValue::set(mtime.nanos as i32),
is_symlink: ActiveValue::set(entry.is_symlink),
is_ignored: ActiveValue::set(entry.is_ignored),
git_status: ActiveValue::set(entry.git_status.map(|status| status as i64)),
is_deleted: ActiveValue::set(false),
scan_id: ActiveValue::set(update.scan_id as i64),
}
@ -2347,6 +2347,7 @@ impl Database {
worktree_entry::Column::MtimeNanos,
worktree_entry::Column::IsSymlink,
worktree_entry::Column::IsIgnored,
worktree_entry::Column::GitStatus,
worktree_entry::Column::ScanId,
])
.to_owned(),
@ -2630,8 +2631,7 @@ impl Database {
}),
is_symlink: db_entry.is_symlink,
is_ignored: db_entry.is_ignored,
// TODO stream statuses
git_status: None,
git_status: db_entry.git_status.map(|status| status as i32),
});
}
}