feat(worktrees): create a new worktree from the popup

Press `c` in the Worktrees popup to open a Create Worktree input.
Enter a path (absolute, or relative to the repo root); gitui creates a
linked worktree there with a new branch named after the final path
component, then the list refreshes to show it.

- asyncgit: new `create_worktree(repo_path, path) -> Result<PathBuf>`
  via git2 `Repository::worktree` (no-ref -> new branch at HEAD), + 2
  tests
- new src/popups/create_worktree.rs (path input, no branch-name
  normalization; live-validates the derived branch name)
- wiring: queue `CreateWorktree`, app field/ctor/macros/handler,
  worktrees popup `c` trigger, strings; App::update refreshes an open
  worktrees list

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BMQxBdr5f3B3jmDtdvGtTu

Author: stevenpollack

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 * support x509 commit signing [[@kaden-l-nelson](https://github.com/kaden-l-nelson)] ([#2514](https://github.com/gitui-org/gitui/issues/2514))
 * worktrees popup: list worktrees and switch between them ([Shift+W])
+* worktrees popup: create a new worktree with a new branch ([c] from the worktrees list)
 
 ### Changed
 * use [tombi](https://github.com/tombi-toml/tombi) for all toml file formatting

asyncgit/src/sync/mod.rs

@@ -109,7 +109,7 @@ pub use utils::{
 	get_head, get_head_tuple, repo_dir, repo_open_error,
 	stage_add_all, stage_add_file, stage_addremoved, Head,
 };
-pub use worktree::{get_worktrees, WorktreeInfo};
+pub use worktree::{create_worktree, get_worktrees, WorktreeInfo};
 
 pub use git2::ResetType;
 

asyncgit/src/sync/worktree.rs

@@ -6,7 +6,7 @@ use git2::{Repository, WorktreeLockStatus};
 use scopetime::scope_time;
 
 use super::{repo, RepoPath};
-use crate::error::Result;
+use crate::error::{Error, Result};
 
 /// name reported for the primary working tree
 const MAIN_WORKTREE_NAME: &str = "(main)";
@@ -122,6 +122,44 @@ fn linked_worktree_info(
 	})
 }
 
+/// Creates a new linked worktree at `worktree_path`, checking out a
+/// new branch named after the final path component.
+///
+/// `worktree_path` may be absolute or relative to the repository's
+/// working directory. Returns the absolute path of the created
+/// worktree.
+pub fn create_worktree(
+	repo_path: &RepoPath,
+	worktree_path: &str,
+) -> Result<PathBuf> {
+	scope_time!("create_worktree");
+
+	let repo = repo(repo_path)?;
+
+	let requested = Path::new(worktree_path);
+
+	let target = if requested.is_absolute() {
+		requested.to_path_buf()
+	} else {
+		repo.workdir().ok_or(Error::NoWorkDir)?.join(requested)
+	};
+
+	let name = target
+		.file_name()
+		.and_then(|n| n.to_str())
+		.ok_or_else(|| {
+			Error::Generic(
+				"invalid worktree path: no final component"
+					.to_string(),
+			)
+		})?
+		.to_string();
+
+	let worktree = repo.worktree(&name, &target, None)?;
+
+	Ok(worktree.path().to_path_buf())
+}
+
 /// short name of the branch a repo's HEAD points at, or `None` when
 /// HEAD is unborn or detached.
 fn head_branch(repo: &Repository) -> Option<String> {
@@ -152,7 +190,7 @@ fn same_workdir(path: &Path, current: Option<&Path>) -> bool {
 
 #[cfg(test)]
 mod tests {
-	use super::{get_worktrees, WorktreeInfo};
+	use super::{create_worktree, get_worktrees, WorktreeInfo};
 	use crate::sync::{tests::repo_init, RepoPath};
 	use pretty_assertions::assert_eq;
 
@@ -223,4 +261,40 @@ mod tests {
 		assert_eq!(list[0].name, "(main)");
 		assert!(list[0].branch.is_none());
 	}
+
+	#[test]
+	fn test_create_worktree_new_branch() {
+		let (_td, repo) = repo_init().unwrap();
+		let root = repo.path().parent().unwrap();
+		let repo_path: RepoPath = root.to_str().unwrap().into();
+
+		// keep the linked worktree outside the main workdir; wt_dir
+		// must stay alive for the whole test.
+		let wt_dir = tempfile::TempDir::new().unwrap();
+		let wt_path = wt_dir.path().join("feature-x");
+
+		let created =
+			create_worktree(&repo_path, wt_path.to_str().unwrap())
+				.unwrap();
+
+		assert!(created.ends_with("feature-x"));
+
+		let list = get_worktrees(&repo_path).unwrap();
+		let wt = find(&list, "feature-x");
+		assert!(wt.path.is_absolute());
+		// libgit2 names the new branch after the worktree.
+		assert_eq!(wt.branch.as_deref(), Some("feature-x"));
+		assert!(!wt.is_current);
+	}
+
+	#[test]
+	fn test_create_worktree_rejects_pathless_name() {
+		let (_td, repo) = repo_init().unwrap();
+		let root = repo.path().parent().unwrap();
+		let repo_path: RepoPath = root.to_str().unwrap().into();
+
+		// a path ending in ".." has no usable final component
+		let res = create_worktree(&repo_path, "..");
+		assert!(res.is_err());
+	}
 }

src/app.rs

@@ -14,13 +14,14 @@ use crate::{
 		AppOption, BlameFilePopup, BranchListPopup,
 		CheckoutOptionPopup, CommitPopup, CompareCommitsPopup,
 		ConfirmPopup, CreateBranchPopup, CreateRemotePopup,
-		ExternalEditorPopup, FetchPopup, FileRevlogPopup,
-		FuzzyFindPopup, GotoLinePopup, HelpPopup, InspectCommitPopup,
-		LogSearchPopupPopup, MsgPopup, OptionsPopup, PullPopup,
-		PushPopup, PushTagsPopup, RemoteListPopup, RenameBranchPopup,
-		RenameRemotePopup, ResetPopup, RevisionFilesPopup,
-		StashMsgPopup, SubmodulesListPopup, TagCommitPopup,
-		TagListPopup, UpdateRemoteUrlPopup, WorktreesPopup,
+		CreateWorktreePopup, ExternalEditorPopup, FetchPopup,
+		FileRevlogPopup, FuzzyFindPopup, GotoLinePopup, HelpPopup,
+		InspectCommitPopup, LogSearchPopupPopup, MsgPopup,
+		OptionsPopup, PullPopup, PushPopup, PushTagsPopup,
+		RemoteListPopup, RenameBranchPopup, RenameRemotePopup,
+		ResetPopup, RevisionFilesPopup, StashMsgPopup,
+		SubmodulesListPopup, TagCommitPopup, TagListPopup,
+		UpdateRemoteUrlPopup, WorktreesPopup,
 	},
 	queue::{
 		Action, AppTabs, InternalEvent, NeedsUpdate, Queue,
@@ -89,6 +90,7 @@ pub struct App {
 	fetch_popup: FetchPopup,
 	tag_commit_popup: TagCommitPopup,
 	create_branch_popup: CreateBranchPopup,
+	create_worktree_popup: CreateWorktreePopup,
 	create_remote_popup: CreateRemotePopup,
 	rename_remote_popup: RenameRemotePopup,
 	update_remote_url_popup: UpdateRemoteUrlPopup,
@@ -213,6 +215,7 @@ impl App {
 			fetch_popup: FetchPopup::new(&env),
 			tag_commit_popup: TagCommitPopup::new(&env),
 			create_branch_popup: CreateBranchPopup::new(&env),
+			create_worktree_popup: CreateWorktreePopup::new(&env),
 			create_remote_popup: CreateRemotePopup::new(&env),
 			rename_remote_popup: RenameRemotePopup::new(&env),
 			update_remote_url_popup: UpdateRemoteUrlPopup::new(&env),
@@ -418,6 +421,7 @@ impl App {
 		self.stashing_tab.update()?;
 		self.stashlist_tab.update()?;
 		self.reset_popup.update()?;
+		self.worktree_popup.update_worktrees()?;
 
 		self.update_commands();
 
@@ -523,6 +527,7 @@ impl App {
 			reset_popup,
 			checkout_option_popup,
 			create_branch_popup,
+			create_worktree_popup,
 			create_remote_popup,
 			rename_remote_popup,
 			update_remote_url_popup,
@@ -566,6 +571,7 @@ impl App {
 			reset_popup,
 			checkout_option_popup,
 			create_branch_popup,
+			create_worktree_popup,
 			rename_branch_popup,
 			revision_files_popup,
 			fuzzy_find_popup,
@@ -797,6 +803,9 @@ impl App {
 			InternalEvent::CreateBranch => {
 				self.create_branch_popup.open()?;
 			}
+			InternalEvent::CreateWorktree => {
+				self.create_worktree_popup.open()?;
+			}
 			InternalEvent::RenameBranch(branch_ref, cur_name) => {
 				self.rename_branch_popup
 					.open(branch_ref, cur_name)?;

src/popups/create_worktree.rs

@@ -0,0 +1,179 @@
+use crate::components::{
+	visibility_blocking, CommandBlocking, CommandInfo, Component,
+	DrawableComponent, EventState, InputType, TextInputComponent,
+};
+use crate::{
+	app::Environment,
+	keys::{key_match, SharedKeyConfig},
+	queue::{InternalEvent, NeedsUpdate, Queue},
+	strings,
+	ui::style::SharedTheme,
+};
+use anyhow::Result;
+use asyncgit::sync::{self, RepoPathRef};
+use crossterm::event::Event;
+use easy_cast::Cast;
+use ratatui::{layout::Rect, widgets::Paragraph, Frame};
+
+pub struct CreateWorktreePopup {
+	repo: RepoPathRef,
+	input: TextInputComponent,
+	queue: Queue,
+	key_config: SharedKeyConfig,
+	theme: SharedTheme,
+}
+
+impl DrawableComponent for CreateWorktreePopup {
+	fn draw(&self, f: &mut Frame, rect: Rect) -> Result<()> {
+		if self.is_visible() {
+			self.input.draw(f, rect)?;
+			self.draw_warnings(f);
+		}
+
+		Ok(())
+	}
+}
+
+impl Component for CreateWorktreePopup {
+	fn commands(
+		&self,
+		out: &mut Vec<CommandInfo>,
+		force_all: bool,
+	) -> CommandBlocking {
+		if self.is_visible() || force_all {
+			self.input.commands(out, force_all);
+
+			out.push(CommandInfo::new(
+				strings::commands::create_worktree_confirm_msg(
+					&self.key_config,
+				),
+				true,
+				true,
+			));
+		}
+
+		visibility_blocking(self)
+	}
+
+	fn event(&mut self, ev: &Event) -> Result<EventState> {
+		if self.is_visible() {
+			if self.input.event(ev)?.is_consumed() {
+				return Ok(EventState::Consumed);
+			}
+
+			if let Event::Key(e) = ev {
+				if key_match(e, self.key_config.keys.enter) {
+					self.create_worktree();
+				}
+
+				return Ok(EventState::Consumed);
+			}
+		}
+		Ok(EventState::NotConsumed)
+	}
+
+	fn is_visible(&self) -> bool {
+		self.input.is_visible()
+	}
+
+	fn hide(&mut self) {
+		self.input.hide();
+	}
+
+	fn show(&mut self) -> Result<()> {
+		self.input.show()?;
+
+		Ok(())
+	}
+}
+
+impl CreateWorktreePopup {
+	///
+	pub fn new(env: &Environment) -> Self {
+		Self {
+			queue: env.queue.clone(),
+			input: TextInputComponent::new(
+				env,
+				&strings::create_worktree_popup_title(
+					&env.key_config,
+				),
+				&strings::create_worktree_popup_msg(&env.key_config),
+				true,
+			)
+			.with_input_type(InputType::Singleline),
+			theme: env.theme.clone(),
+			key_config: env.key_config.clone(),
+			repo: env.repo.clone(),
+		}
+	}
+
+	///
+	pub fn open(&mut self) -> Result<()> {
+		self.show()?;
+
+		Ok(())
+	}
+
+	///
+	pub fn create_worktree(&mut self) {
+		let path = self.input.get_text().to_string();
+
+		if path.trim().is_empty() {
+			self.hide();
+			return;
+		}
+
+		let res = sync::create_worktree(&self.repo.borrow(), &path);
+
+		self.input.clear();
+		self.hide();
+
+		match res {
+			Ok(_) => {
+				self.queue
+					.push(InternalEvent::Update(NeedsUpdate::ALL));
+			}
+			Err(e) => {
+				log::error!("create worktree: {e}");
+				self.queue.push(InternalEvent::ShowErrorMsg(
+					format!("create worktree error:\n{e}"),
+				));
+			}
+		}
+	}
+
+	fn draw_warnings(&self, f: &mut Frame) {
+		let current_text = self.input.get_text();
+
+		let derived_name = std::path::Path::new(current_text)
+			.file_name()
+			.and_then(|s| s.to_str());
+
+		if let Some(derived_name) = derived_name {
+			let valid = sync::validate_branch_name(derived_name)
+				.unwrap_or_default();
+
+			if !valid {
+				let msg = strings::branch_name_invalid();
+				let msg_length: u16 = msg.len().cast();
+				let w = Paragraph::new(msg)
+					.style(self.theme.text_danger());
+
+				let rect = {
+					let mut rect = self.input.get_area();
+					rect.y += rect.height.saturating_sub(1);
+					rect.height = 1;
+					let offset =
+						rect.width.saturating_sub(msg_length + 1);
+					rect.width =
+						rect.width.saturating_sub(offset + 1);
+					rect.x += offset;
+
+					rect
+				};
+
+				f.render_widget(w, rect);
+			}
+		}
+	}
+}

src/popups/mod.rs

@@ -6,6 +6,7 @@ mod compare_commits;
 mod confirm;
 mod create_branch;
 mod create_remote;
+mod create_worktree;
 mod externaleditor;
 mod fetch;
 mod file_revlog;
@@ -39,6 +40,7 @@ pub use compare_commits::CompareCommitsPopup;
 pub use confirm::ConfirmPopup;
 pub use create_branch::CreateBranchPopup;
 pub use create_remote::CreateRemotePopup;
+pub use create_worktree::CreateWorktreePopup;
 pub use externaleditor::ExternalEditorPopup;
 pub use fetch::FetchPopup;
 pub use file_revlog::{FileRevOpen, FileRevlogPopup};