Switch to status tab after merge / rebase with conflicts

Issue gitui-org#926

Author: alessandroasm

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Added
 - support rebasing branches with conflicts ([#895](https://github.com/extrawurst/gitui/issues/895))
+- switch to status tab after merging or rebasing with conflicts ([#926](https://github.com/extrawurst/gitui/issues/926))
 
 ## Fixed
 - fix supported checkout of hierarchical branchnames ([#921](https://github.com/extrawurst/gitui/issues/921))

asyncgit/src/sync/mod.rs

@@ -79,8 +79,8 @@ pub use tags::{
 };
 pub use tree::{tree_file_content, tree_files, TreeFile};
 pub use utils::{
-	get_head, get_head_tuple, is_bare_repo, is_repo, repo_dir,
-	stage_add_all, stage_add_file, stage_addremoved, Head,
+	get_head, get_head_tuple, has_conflicts, is_bare_repo, is_repo,
+	repo_dir, stage_add_all, stage_add_file, stage_addremoved, Head,
 };
 
 #[cfg(test)]

asyncgit/src/sync/utils.rs

@@ -197,6 +197,14 @@ pub(crate) fn repo_write_file(
 	Ok(())
 }
 
+/// checks if repository has conflicts
+pub fn has_conflicts(repo_path: &str) -> Result<bool> {
+	let repo = repo(repo_path)?;
+	let index = repo.index()?;
+
+	Ok(index.has_conflicts())
+}
+
 #[cfg(test)]
 pub(crate) fn repo_read_file(
 	repo: &Repository,

src/components/branchlist.rs

@@ -368,8 +368,7 @@ impl BranchListComponent {
 		{
 			sync::merge_branch(CWD, &branch.name)?;
 
-			self.hide();
-			self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
+			self.hide_and_check_for_conflicts()?;
 		}
 
 		Ok(())
@@ -381,9 +380,18 @@ impl BranchListComponent {
 		{
 			sync::rebase_branch(CWD, &branch.name)?;
 
-			self.hide();
+			self.hide_and_check_for_conflicts()?;
+		}
+
+		Ok(())
+	}
+
+	fn hide_and_check_for_conflicts(&mut self) -> Result<()> {
+		self.hide();
+		self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
 
-			self.queue.push(InternalEvent::Update(NeedsUpdate::ALL));
+		if sync::has_conflicts(CWD)? {
+			self.queue.push(InternalEvent::TabSwitch);
 		}
 
 		Ok(())