preset rebase commit msg

Author: Stephan Dilly

asyncgit/src/sync/rebase.rs

@@ -143,6 +143,8 @@ pub struct RebaseProgress {
 	pub steps: usize,
 	///
 	pub current: usize,
+	///
+	pub current_commit: Option<CommitId>,
 }
 
 ///
@@ -151,9 +153,15 @@ pub fn get_rebase_progress(
 ) -> Result<RebaseProgress> {
 	let mut rebase = repo.open_rebase(None)?;
 
+	let current_commit: Option<CommitId> = rebase
+		.operation_current()
+		.and_then(|idx| rebase.nth(idx))
+		.map(|op| op.id().into());
+
 	let progress = RebaseProgress {
 		steps: rebase.len(),
 		current: rebase.operation_current().unwrap_or_default(),
+		current_commit,
 	};
 
 	Ok(progress)
@@ -286,7 +294,8 @@ mod test_rebase {
 
 		create_branch(repo_path, "foo").unwrap();
 
-		write_commit_file(&repo, "test.txt", "test2", "commit2");
+		let c =
+			write_commit_file(&repo, "test.txt", "test2", "commit2");
 
 		checkout_branch(repo_path, "refs/heads/master").unwrap();
 
@@ -306,7 +315,8 @@ mod test_rebase {
 			get_rebase_progress(&repo).unwrap(),
 			RebaseProgress {
 				current: 0,
-				steps: 1
+				steps: 1,
+				current_commit: Some(c)
 			}
 		);
 

src/components/commit.rs

@@ -13,7 +13,8 @@ use anyhow::Result;
 use asyncgit::{
 	cached,
 	sync::{
-		self, get_config_string, CommitId, HookResult, RepoState,
+		self, get_commit_info, get_config_string, CommitId,
+		HookResult, RepoState,
 	},
 	CWD,
 };
@@ -254,6 +255,19 @@ impl CommitComponent {
 			!= self.commit_template.as_ref().map(|s| s.trim())
 	}
 
+	fn rebase_commit_msg() -> Result<String> {
+		let progress = sync::rebase_progress(CWD)?;
+
+		let id = if let Some(id) = progress.current_commit {
+			id
+		} else {
+			anyhow::bail!("no commit id")
+		};
+
+		let info = get_commit_info(CWD, &id)?;
+		Ok(info.message)
+	}
+
 	fn amend(&mut self) -> Result<()> {
 		if self.can_amend() {
 			let id = sync::get_head(CWD)?;
@@ -369,26 +383,36 @@ impl Component for CommitComponent {
 
 		self.mode = Mode::Normal;
 
-		self.mode = if sync::repo_state(CWD)? == RepoState::Merge {
-			let ids = sync::mergehead_ids(CWD)?;
-			self.input.set_title(strings::commit_title_merge());
-			self.input.set_text(sync::merge_msg(CWD)?);
-			Mode::Merge(ids)
-		} else {
-			self.commit_template =
-				get_config_string(CWD, "commit.template")
-					.ok()
-					.flatten()
-					.and_then(|path| read_to_string(path).ok());
-
-			if self.is_empty() {
-				if let Some(s) = &self.commit_template {
-					self.input.set_text(s.clone());
-				}
+		self.mode = match sync::repo_state(CWD)? {
+			RepoState::Merge => {
+				let ids = sync::mergehead_ids(CWD)?;
+				self.input.set_title(strings::commit_title_merge());
+				self.input.set_text(sync::merge_msg(CWD)?);
+				Mode::Merge(ids)
+			}
+			RepoState::Rebase => {
+				self.input.set_title(strings::commit_title_rebase());
+				self.input.set_text(
+					Self::rebase_commit_msg().unwrap_or_default(),
+				);
+				Mode::Normal
 			}
+			_ => {
+				self.commit_template =
+					get_config_string(CWD, "commit.template")
+						.ok()
+						.flatten()
+						.and_then(|path| read_to_string(path).ok());
+
+				if self.is_empty() {
+					if let Some(s) = &self.commit_template {
+						self.input.set_text(s.clone());
+					}
+				}
 
-			self.input.set_title(strings::commit_title());
-			Mode::Normal
+				self.input.set_title(strings::commit_title());
+				Mode::Normal
+			}
 		};
 
 		self.input.show()?;

src/strings.rs

@@ -86,6 +86,9 @@ pub fn commit_title() -> String {
 pub fn commit_title_merge() -> String {
 	"Commit (Merge)".to_string()
 }
+pub fn commit_title_rebase() -> String {
+	"Commit (Rebase)".to_string()
+}
 pub fn commit_title_amend() -> String {
 	"Commit (Amend)".to_string()
 }

src/tabs/status.rs

@@ -14,8 +14,8 @@ use crate::{
 use anyhow::Result;
 use asyncgit::{
 	cached,
-	sync::BranchCompare,
 	sync::{self, status::StatusType, RepoState},
+	sync::{BranchCompare, CommitId},
 	AsyncDiff, AsyncGitNotification, AsyncStatus, DiffParams,
 	DiffType, StatusParams, CWD,
 };
@@ -235,7 +235,15 @@ impl Status {
 			RepoState::Rebase => {
 				let progress =
 					if let Ok(p) = sync::rebase_progress(CWD) {
-						format!("{}/{}", p.current + 1, p.steps)
+						format!(
+							"[{}] {}/{}",
+							p.current_commit
+								.as_ref()
+								.map(CommitId::get_short_string)
+								.unwrap_or_default(),
+							p.current + 1,
+							p.steps
+						)
 					} else {
 						String::new()
 					};