Support choosing checkout branch method when status is not empty

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+* support choosing checkout branch method when status is not empty [[@extrawurst](https://github.com/extrawurst)] ([#2404](https://github.com/extrawurst/gitui/issues/2404))
+
 ## [0.27.0] - 2024-01-14
 
 **new: manage remotes**

asyncgit/src/sync/status.rs

@@ -195,3 +195,54 @@ pub fn get_status(
 
 Ok(res)
 }
+
+/// discard all changes in the working directory
+pub fn discard_status(repo_path: &RepoPath) -> Result<bool> {
+let repo = repo(repo_path)?;
+let statuses = repo.statuses(None)?;
+
+for status in statuses.iter() {
+if status.status().is_wt_modified()
+|| status.status().is_wt_new()
+{
+let oid = repo.head()?.target().unwrap();
+let obj = repo.find_object(oid, None)?;
+
+repo.checkout_tree(&obj, None)?;
+repo.reset(&obj, git2::ResetType::Hard, None)?;
+}
+}
+
+Ok(true)
+}
+
+#[cfg(test)]
+mod tests {
+use super::*;
+use crate::sync::tests::repo_init;
+use std::{fs::File, io::Write, path::Path};
+
+#[test]
+fn test_discard_status() {
+let file_path = Path::new("foo");
+let (_td, repo) = repo_init().unwrap();
+let root = repo.path().parent().unwrap();
+let repo_path: &RepoPath =
+&root.as_os_str().to_str().unwrap().into();
+
+File::create(root.join(file_path))
+.unwrap()
+.write_all(b"test\nfoo")
+.unwrap();
+
+ let statuses = get_status(repo_path, StatusType::WorkingDir, None)
+ .unwrap();
+ assert_eq!(statuses.len(), 1);
+
+ discard_status(repo_path).unwrap();
+
+ let statuses = get_status(repo_path, StatusType::WorkingDir, None)
+ .unwrap();
+ assert_eq!(statuses.len(), 0);
+}
+}

src/app.rs

@@ -10,16 +10,16 @@ use crate::{
 options::{Options, SharedOptions},
 popup_stack::PopupStack,
 popups::{
-AppOption, BlameFilePopup, BranchListPopup, CommitPopup,
-CompareCommitsPopup, ConfirmPopup, CreateBranchPopup,
-CreateRemotePopup, ExternalEditorPopup, FetchPopup,
-FileRevlogPopup, FuzzyFindPopup, HelpPopup,
-InspectCommitPopup, LogSearchPopupPopup, MsgPopup,
-OptionsPopup, PullPopup, PushPopup, PushTagsPopup,
-RemoteListPopup, RenameBranchPopup, RenameRemotePopup,
-ResetPopup, RevisionFilesPopup, StashMsgPopup,
-SubmodulesListPopup, TagCommitPopup, TagListPopup,
-UpdateRemoteUrlPopup,
+AppOption, BlameFilePopup, BranchListPopup,
+CheckoutOptionPopup, CommitPopup, CompareCommitsPopup,
+ConfirmPopup, CreateBranchPopup, CreateRemotePopup,
+ExternalEditorPopup, FetchPopup, FileRevlogPopup,
+FuzzyFindPopup, HelpPopup, InspectCommitPopup,
+LogSearchPopupPopup, MsgPopup, OptionsPopup, PullPopup,
+PushPopup, PushTagsPopup, RemoteListPopup, RenameBranchPopup,
+RenameRemotePopup, ResetPopup, RevisionFilesPopup,
+StashMsgPopup, SubmodulesListPopup, TagCommitPopup,
+TagListPopup, UpdateRemoteUrlPopup,
 },
 queue::{
 Action, AppTabs, InternalEvent, NeedsUpdate, Queue,
@@ -98,6 +98,7 @@ pub struct App {
 submodule_popup: SubmodulesListPopup,
 tags_popup: TagListPopup,
 reset_popup: ResetPopup,
+checkout_option_popup: CheckoutOptionPopup,
 cmdbar: RefCell<CommandBar>,
 tab: usize,
 revlog: Revlog,
@@ -218,6 +219,7 @@ impl App {
 stashing_tab: Stashing::new(&env),
 stashlist_tab: StashList::new(&env),
 files_tab: FilesTab::new(&env),
+checkout_option_popup: CheckoutOptionPopup::new(&env),
 tab: 0,
 queue: env.queue,
 theme: env.theme,
@@ -493,6 +495,7 @@ impl App {
 fetch_popup,
 tag_commit_popup,
 reset_popup,
+checkout_option_popup,
 create_branch_popup,
 create_remote_popup,
 rename_remote_popup,
@@ -533,6 +536,7 @@ impl App {
 submodule_popup,
 tags_popup,
 reset_popup,
+checkout_option_popup,
 create_branch_popup,
 rename_branch_popup,
 revision_files_popup,
@@ -905,6 +909,9 @@ impl App {
 InternalEvent::CommitSearch(options) => {
 self.revlog.search(options);
 }
+InternalEvent::CheckoutOption(branch, is_local) => {
+self.checkout_option_popup.open(branch, is_local)?;
+}
 };
 
 Ok(flags)

src/popups/branchlist.rs

@@ -20,8 +20,9 @@ use asyncgit::{
 checkout_remote_branch, BranchDetails, LocalBranch,
 RemoteBranch,
 },
-checkout_branch, get_branches_info, BranchInfo, BranchType,
-CommitId, RepoPathRef, RepoState,
+checkout_branch, get_branches_info,
+status::StatusType,
+BranchInfo, BranchType, CommitId, RepoPathRef, RepoState,
 },
 AsyncGitNotification,
 };
@@ -582,23 +583,37 @@ impl BranchListPopup {
 anyhow::bail!("no valid branch selected");
 }
 
-if self.local {
-checkout_branch(
-&self.repo.borrow(),
-&self.branches[self.selection as usize].name,
-)?;
-self.hide();
+let status = sync::status::get_status(
+&self.repo.borrow(),
+StatusType::WorkingDir,
+None,
+)
+.unwrap();
+
+let selected_branch = &self.branches[self.selection as usize];
+if status.is_empty() {
+if self.local {
+checkout_branch(
+&self.repo.borrow(),
+&selected_branch.name,
+)?;
+self.hide();
+} else {
+checkout_remote_branch(
+&self.repo.borrow(),
+&selected_branch,
+)?;
+self.local = true;
+self.update_branches()?;
+}
+self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
 } else {
-checkout_remote_branch(
-&self.repo.borrow(),
-&self.branches[self.selection as usize],
-)?;
-self.local = true;
-self.update_branches()?;
+self.queue.push(InternalEvent::CheckoutOption(
+selected_branch.clone(),
+self.local.clone(),
+));
 }
 
-self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
-
 Ok(())
 }