Separate repository state synchronization from worktree synchronization (#27140)

This PR updates our DB schemas and wire protocol to separate the
synchronization of git statuses and other repository state from the
synchronization of worktrees. This paves the way for moving the code
that executes git status updates out of the `worktree` crate and onto
the new `GitStore`. That end goal is motivated by two (related) points:

- Disentangling git status updates from the worktree's
`BackgroundScanner` will allow us to implement a simpler concurrency
story for those updates, hopefully fixing some known but elusive bugs
(upstream state not updating after push; statuses getting out of sync in
remote projects).
- By moving git repository state to the project-scoped `GitStore`, we
can get rid of the duplication that currently happens when two worktrees
are associated with the same git repository.

Co-authored-by: Max <max@zed.dev>

Release Notes:

- N/A

---------

Co-authored-by: Max <max@zed.dev>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>

crates/collab/src/db/tables/project.rs

@@ -45,6 +45,8 @@ pub enum Relation {
     Room,
     #[sea_orm(has_many = "super::worktree::Entity")]
     Worktrees,
+    #[sea_orm(has_many = "super::project_repository::Entity")]
+    Repositories,
     #[sea_orm(has_many = "super::project_collaborator::Entity")]
     Collaborators,
     #[sea_orm(has_many = "super::language_server::Entity")]
@@ -69,6 +71,12 @@ impl Related<super::worktree::Entity> for Entity {
     }
 }
 
+impl Related<super::project_repository::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Repositories.def()
+    }
+}
+
 impl Related<super::project_collaborator::Entity> for Entity {
     fn to() -> RelationDef {
         Relation::Collaborators.def()

crates/collab/src/db/tables/project_repository.rs

@@ -2,16 +2,17 @@ use crate::db::ProjectId;
 use sea_orm::entity::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktree_repositories")]
+#[sea_orm(table_name = "project_repositories")]
 pub struct Model {
     #[sea_orm(primary_key)]
     pub project_id: ProjectId,
     #[sea_orm(primary_key)]
-    pub worktree_id: i64,
-    #[sea_orm(primary_key)]
-    pub work_directory_id: i64,
+    pub id: i64,
+    pub abs_path: String,
+    pub legacy_worktree_id: Option<i64>,
+    // JSON array containing 1 or more integer project entry ids
+    pub entry_ids: String,
     pub scan_id: i64,
-    pub branch: Option<String>,
     pub is_deleted: bool,
     // JSON array typed string
     pub current_merge_conflicts: Option<String>,
@@ -20,6 +21,19 @@ pub struct Model {
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {}
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::project::Entity",
+        from = "Column::ProjectId",
+        to = "super::project::Column::Id"
+    )]
+    Project,
+}
+
+impl Related<super::project::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Project.def()
+    }
+}
 
 impl ActiveModelBehavior for ActiveModel {}

crates/collab/src/db/tables/project_repository_statuses.rs

@@ -2,14 +2,12 @@ use crate::db::ProjectId;
 use sea_orm::entity::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "worktree_repository_statuses")]
+#[sea_orm(table_name = "project_repository_statuses")]
 pub struct Model {
     #[sea_orm(primary_key)]
     pub project_id: ProjectId,
     #[sea_orm(primary_key)]
-    pub worktree_id: i64,
-    #[sea_orm(primary_key)]
-    pub work_directory_id: i64,
+    pub repository_id: i64,
     #[sea_orm(primary_key)]
     pub repo_path: String,
     /// Old single-code status field, no longer used but kept here to mirror the DB schema.