chore: format

Author: Fatpandac

asyncgit/src/sync/branch/mod.rs

@@ -109,6 +109,25 @@ impl BranchInfo {
 	pub const fn is_local(&self) -> bool {
 		matches!(self.details, BranchDetails::Local(_))
 	}
+
+	/// switches to this branch in given repo
+	pub fn checkout<F>(
+		&self,
+		repo: &RepoPath,
+		method: F,
+	) -> Result<()>
+	where
+		F: FnOnce(&RepoPath, &Self) -> Result<()>,
+	{
+		if self.is_local() {
+			checkout_branch(repo, &self.name)?;
+		} else {
+			checkout_remote_branch(repo, self)?;
+		}
+
+		method(repo, &self)?;
+		Ok(())
+	}
 }
 
 ///

src/popups/branchlist.rs

@@ -16,11 +16,8 @@ use anyhow::Result;
 use asyncgit::{
 	sync::{
 		self,
-		branch::{
-			checkout_remote_branch, BranchDetails, LocalBranch,
-			RemoteBranch,
-		},
-		checkout_branch, get_branches_info,
+		branch::{BranchDetails, LocalBranch, RemoteBranch},
+		get_branches_info,
 		status::StatusType,
 		BranchInfo, BranchType, CommitId, RepoPathRef, RepoState,
 	},
@@ -592,20 +589,18 @@ impl BranchListPopup {
 
 		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()?;
-			}
+			selected_branch.checkout(
+				&self.repo.borrow(),
+				|repo, branch| {
+					if branch.is_local() {
+						self.hide();
+						Ok(())
+					} else {
+						self.local = true;
+						self.update_branches()?;
+					}
+				},
+			)?;
 			self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
 		} else {
 			self.queue.push(InternalEvent::CheckoutOption(

src/popups/checkout_option.rs

@@ -15,9 +15,7 @@ use crate::{
 use anyhow::{Ok, Result};
 use asyncgit::sync::branch::checkout_remote_branch;
 use asyncgit::sync::status::discard_status;
-use asyncgit::sync::{
-	checkout_branch, BranchInfo, RepoPath,
-};
+use asyncgit::sync::{checkout_branch, BranchInfo, RepoPath};
 use crossterm::event::Event;
 use ratatui::{
 	layout::{Alignment, Rect},
@@ -89,17 +87,7 @@ impl CheckoutOptionPopup {
 
 	fn checkout(&self) -> Result<()> {
 		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"),
-				)?;
-			}
+			branch.checkout(&self.repo)?;
 		}
 
 		Ok(())