new

Author: Caleb-T-Owens

Cargo.lock

@@ -76,6 +76,7 @@ but-core = { path = "crates/but-core" }
 but-workspace = { path = "crates/but-workspace" }
 but-hunk-assignment = { path = "crates/but-hunk-assignment" }
 but-hunk-dependency = { path = "crates/but-hunk-dependency" }
+but-worktrees = { path = "crates/but-worktrees" }
 but-db = { path = "crates/but-db" }
 but-path = { path = "crates/but-path" }
 but-graph = { path = "crates/but-graph" }

Cargo.toml

@@ -27,6 +27,7 @@ gitbutler-user.workspace = true
 gitbutler-project.workspace = true
 gitbutler-secret.workspace = true
 but-workspace.workspace = true
+but-worktrees.workspace = true
 but-core.workspace = true
 but-hunk-assignment.workspace = true
 but-action.workspace = true

crates/but-api/Cargo.toml

@@ -20,4 +20,5 @@ pub mod stack;
 pub mod users;
 pub mod virtual_branches;
 pub mod workspace;
+pub mod worktree;
 pub mod zip;

crates/but-api/src/commands/mod.rs

@@ -0,0 +1,19 @@
+use crate::error::Error;
+use but_api_macros::api_cmd;
+use but_settings::AppSettings;
+use but_worktrees::new::NewWorktreeOutcome;
+use gitbutler_command_context::CommandContext;
+use gitbutler_project::ProjectId;
+use tracing::instrument;
+
+#[api_cmd]
+#[cfg_attr(feature = "tauri", tauri::command(async))]
+#[instrument(err(Debug))]
+pub fn worktree_new(project_id: ProjectId, reference: String) -> Result<NewWorktreeOutcome, Error> {
+    let project = gitbutler_project::get(project_id)?;
+    let guard = project.exclusive_worktree_access();
+    let mut ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+
+    but_worktrees::new::worktree_new(&mut ctx, guard.read_permission(), &reference)
+        .map_err(Into::into)
+}

crates/but-api/src/commands/worktree.rs

@@ -1,9 +1,7 @@
 -- Create worktrees table
 CREATE TABLE `worktrees`(
-	`id` TEXT NOT NULL PRIMARY KEY,
+	`path` TEXT NOT NULL PRIMARY KEY,
+	`reference` TEXT NOT NULL,
 	`base` TEXT NOT NULL,
-	`path` TEXT NOT NULL,
 	`source` TEXT NOT NULL
 );
-
-CREATE INDEX index_worktrees_on_path ON worktrees (path);

crates/but-db/migrations/2025-10-13-092749_worktrees/up.sql

@@ -20,7 +20,7 @@ pub use file_write_locks::FileWriteLock;
 mod workspace_rules;
 pub use workspace_rules::WorkspaceRule;
 mod worktrees;
-pub use worktrees::{Worktree, WorktreeSource};
+pub use worktrees::Worktree;
 
 use diesel_migrations::{EmbeddedMigrations, MigrationHarness, embed_migrations};
 pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("./migrations");

crates/but-db/src/lib.rs

@@ -88,10 +88,10 @@ diesel::table! {
 }
 
 diesel::table! {
-    worktrees (id) {
-        id -> Text,
-        base -> Text,
+    worktrees (path) {
         path -> Text,
+        reference -> Text,
+        base -> Text,
         source -> Text,
     }
 }

crates/but-db/src/schema.rs

@@ -6,20 +6,16 @@ use crate::schema::worktrees::dsl::worktrees;
 use diesel::prelude::{Insertable, Queryable, Selectable};
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-pub enum WorktreeSource {
-    Branch(String),
-}
-
 #[derive(
     Debug, Clone, PartialEq, Serialize, Deserialize, Queryable, Selectable, Insertable, Identifiable,
 )]
 #[diesel(table_name = crate::schema::worktrees)]
 #[diesel(check_for_backend(diesel::sqlite::Sqlite))]
+#[diesel(primary_key(path))]
 pub struct Worktree {
-    pub id: String,
-    pub base: String,
     pub path: String,
+    pub reference: String,
+    pub base: String,
     pub source: String,
 }
 
@@ -41,16 +37,16 @@ impl WorktreesHandle<'_> {
         Ok(())
     }
 
-    pub fn get(&mut self, id: &str) -> Result<Option<Worktree>, diesel::result::Error> {
+    pub fn get(&mut self, path: &str) -> Result<Option<Worktree>, diesel::result::Error> {
         let worktree = worktrees
-            .filter(crate::schema::worktrees::id.eq(id))
+            .filter(crate::schema::worktrees::path.eq(path))
             .first::<Worktree>(&mut self.db.conn)
             .optional()?;
         Ok(worktree)
     }
 
-    pub fn delete(&mut self, id: &str) -> Result<(), diesel::result::Error> {
-        diesel::delete(worktrees.filter(crate::schema::worktrees::id.eq(id)))
+    pub fn delete(&mut self, path: &str) -> Result<(), diesel::result::Error> {
+        diesel::delete(worktrees.filter(crate::schema::worktrees::path.eq(path)))
             .execute(&mut self.db.conn)?;
         Ok(())
     }

crates/but-db/src/worktrees.rs

@@ -11,13 +11,17 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 but-db.workspace = true
+but-workspace.workspace = true
+but-graph.workspace = true
 gix.workspace = true
 gitbutler-command-context.workspace = true
 gitbutler-project.workspace = true
 gitbutler-stack.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 uuid.workspace = true
+bstr.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
 gix-testtools.workspace = true