refactor: use BranchInfo instead of local in CheckoutOptionPopup

Author: Fatpandac

asyncgit/src/sync/branch/mod.rs

@@ -104,6 +104,11 @@ impl BranchInfo {
 
 		None
 	}
+
+	/// returns whether branch is local
+	pub const fn is_local(&self) -> bool {
+		matches!(self.details, BranchDetails::Local(_))
+	}
 }
 
 ///

src/app.rs

@@ -909,8 +909,8 @@ impl App {
 			InternalEvent::CommitSearch(options) => {
 				self.revlog.search(options);
 			}
-			InternalEvent::CheckoutOption(branch, is_local) => {
-				self.checkout_option_popup.open(branch, is_local)?;
+			InternalEvent::CheckoutOption(branch) => {
+				self.checkout_option_popup.open(branch)?;
 			}
 		}
 

src/popups/branchlist.rs

@@ -609,8 +609,7 @@ impl BranchListPopup {
 			self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
 		} else {
 			self.queue.push(InternalEvent::CheckoutOption(
-				selected_branch.clone(),
-				self.local,
+				selected_branch.clone()
 			));
 		}
 

src/popups/checkout_option.rs

@@ -29,7 +29,6 @@ use ratatui::{
 pub struct CheckoutOptionPopup {
 	queue: Queue,
 	repo: RepoPath,
-	local: bool,
 	branch: Option<BranchInfo>,
 	option: CheckoutOptions,
 	visible: bool,
@@ -43,7 +42,6 @@ impl CheckoutOptionPopup {
 		Self {
 			queue: env.queue.clone(),
 			repo: env.repo.borrow().clone(),
-			local: false,
 			branch: None,
 			option: CheckoutOptions::StashAndReapply,
 			visible: false,
@@ -82,30 +80,27 @@ impl CheckoutOptionPopup {
 	}
 
 	///
-	pub fn open(
-		&mut self,
-		branch: BranchInfo,
-		is_local: bool,
-	) -> Result<()> {
+	pub fn open(&mut self, branch: BranchInfo) -> Result<()> {
 		self.show()?;
 
 		self.branch = Some(branch);
-		self.local = is_local;
 
 		Ok(())
 	}
 
 	fn checkout(&self) -> Result<()> {
-		if self.local {
-			checkout_branch(
-				&self.repo,
-				&self.branch.as_ref().expect("No branch").name,
-			)?;
-		} else {
-			checkout_remote_branch(
-				&self.repo,
-				self.branch.as_ref().expect("No branch"),
-			)?;
+		if let Some(branch) = &self.branch {
+			if branch.is_local() {
+				checkout_branch(
+					&self.repo,
+					&self.branch.as_ref().expect("No branch").name,
+				)?;
+			} else {
+				checkout_remote_branch(
+					&self.repo,
+					self.branch.as_ref().expect("No branch"),
+				)?;
+			}
 		}
 
 		Ok(())

src/queue.rs

@@ -159,7 +159,7 @@ pub enum InternalEvent {
 	///
 	CommitSearch(LogFilterSearchOptions),
 	///
-	CheckoutOption(BranchInfo, bool),
+	CheckoutOption(BranchInfo),
 }
 
 /// single threaded simple queue for components to communicate with each other