Merge branch 'extrawurst:master' into allow-multiline-commit-messgages

Author: heiskane

CHANGELOG.md

@@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * add `regex-fancy` and `regex-onig` features to allow building Syntect with Onigumara regex engine instead of the default engine based on fancy-regex [[@jirutka](https://github.com/jirutka)]
 * add `vendor-openssl` feature to allow building without vendored openssl [[@jirutka](https://github.com/jirutka)]
 * allow copying marked commits [[@remique](https://github.com/remique)] ([#1288](https://github.com/extrawurst/gitui/issues/1288))
+* display tags and branches in the log view [[@alexmaco]](https://github.com/alexmaco)([#1371](https://github.com/extrawurst/gitui/pull/1371))
+* display current repository path in the top-right corner [[@alexmaco]](https://github.com/alexmaco)([#1387](https://github.com/extrawurst/gitui/pull/1387))
 
 ### Fixes
 * remove insecure dependency `ansi_term` ([#1290](https://github.com/extrawurst/gitui/issues/1290))

Cargo.lock

@@ -69,4 +69,7 @@ install-timing:
 	cargo install --features=timing --path "." --offline
 
 licenses:
-	cargo bundle-licenses --format toml --output THIRDPARTY.toml
+	cargo bundle-licenses --format toml --output THIRDPARTY.toml
+
+clean:
+	cargo clean

Makefile

@@ -18,4 +18,4 @@ Notes:
 * rgb colors might not be supported in every terminal. 
 * using a color like `yellow` might appear in whatever your terminal/theme defines for `yellow`
 * valid colors can be found in tui-rs' [Color](https://docs.rs/tui/0.12.0/tui/style/enum.Color.html) struct. 
-* all customizable theme elements can be found in `style.rs` in the `impl Default for Theme` block
+* all customizable theme elements can be found in [`style.rs` in the `impl Default for Theme` block](https://github.com/extrawurst/gitui/blob/master/src/ui/style.rs#L305)

THEMES.md

@@ -207,7 +207,7 @@ mod test {
 			let res =
 				self.v.fetch_add(self.value_to_add, Ordering::SeqCst);
 
-			println!("[job] value: {}", res);
+			println!("[job] value: {res}");
 
 			Ok(())
 		}
@@ -236,8 +236,8 @@ mod test {
 		}
 
 		println!("recv");
-		let _foo = receiver.recv().unwrap();
-		let _foo = receiver.recv().unwrap();
+		receiver.recv().unwrap();
+		receiver.recv().unwrap();
 		assert!(receiver.is_empty());
 
 		assert_eq!(
@@ -282,7 +282,7 @@ mod test {
 		wait_for_job(&job);
 
 		println!("recv");
-		let _foo = receiver.recv().unwrap();
+		receiver.recv().unwrap();
 		println!("received");
 
 		assert_eq!(

asyncgit/src/asyncjob/mod.rs

@@ -83,12 +83,12 @@ pub type Result<T> = std::result::Result<T, Error>;
 
 impl<T> From<std::sync::PoisonError<T>> for Error {
 	fn from(error: std::sync::PoisonError<T>) -> Self {
-		Self::Generic(format!("poison error: {}", error))
+		Self::Generic(format!("poison error: {error}"))
 	}
 }
 
 impl<T> From<crossbeam_channel::SendError<T>> for Error {
 	fn from(error: crossbeam_channel::SendError<T>) -> Self {
-		Self::Generic(format!("send error: {}", error))
+		Self::Generic(format!("send error: {error}"))
 	}
 }

asyncgit/src/error.rs

@@ -170,18 +170,15 @@ mod tests {
 		let repo_path: &RepoPath =
 			&root.as_os_str().to_str().unwrap().into();
 
-		assert!(matches!(
-			blame_file(&repo_path, "foo", None),
-			Err(_)
-		));
+		assert!(matches!(blame_file(repo_path, "foo", None), Err(_)));
 
 		File::create(&root.join(file_path))?
 			.write_all(b"line 1\n")?;
 
 		stage_add_file(repo_path, file_path)?;
 		commit(repo_path, "first commit")?;
 
-		let blame = blame_file(&repo_path, "foo", None)?;
+		let blame = blame_file(repo_path, "foo", None)?;
 
 		assert!(matches!(
 			blame.lines.as_slice(),
@@ -205,7 +202,7 @@ mod tests {
 		stage_add_file(repo_path, file_path)?;
 		commit(repo_path, "second commit")?;
 
-		let blame = blame_file(&repo_path, "foo", None)?;
+		let blame = blame_file(repo_path, "foo", None)?;
 
 		assert!(matches!(
 			blame.lines.as_slice(),
@@ -232,14 +229,14 @@ mod tests {
 
 		file.write(b"line 3\n")?;
 
-		let blame = blame_file(&repo_path, "foo", None)?;
+		let blame = blame_file(repo_path, "foo", None)?;
 
 		assert_eq!(blame.lines.len(), 2);
 
 		stage_add_file(repo_path, file_path)?;
 		commit(repo_path, "third commit")?;
 
-		let blame = blame_file(&repo_path, "foo", None)?;
+		let blame = blame_file(repo_path, "foo", None)?;
 
 		assert_eq!(blame.lines.len(), 3);
 
@@ -264,6 +261,6 @@ mod tests {
 		stage_add_file(repo_path, file_path).unwrap();
 		commit(repo_path, "first commit").unwrap();
 
-		assert!(blame_file(&repo_path, "bar\\foo", None).is_ok());
+		assert!(blame_file(repo_path, "bar\\foo", None).is_ok());
 	}
 }

asyncgit/src/sync/blame.rs

@@ -158,7 +158,7 @@ mod test {
 			false,
 			false,
 			None,
-			None.into(),
+			None,
 		)
 		.is_err());
 
@@ -195,7 +195,7 @@ mod test {
 		//verify commit msg
 		let details = crate::sync::get_commit_details(
 			&clone2_dir.into(),
-			merge_commit.into(),
+			merge_commit,
 		)
 		.unwrap();
 		assert_eq!(

asyncgit/src/sync/branch/merge_commit.rs

@@ -206,7 +206,7 @@ pub(crate) fn branch_set_upstream(
 
 	if branch.upstream().is_err() {
 		let remote = get_default_remote_in_repo(repo)?;
-		let upstream_name = format!("{}/{}", remote, branch_name);
+		let upstream_name = format!("{remote}/{branch_name}");
 		branch.set_upstream(Some(upstream_name.as_str()))?;
 	}
 

asyncgit/src/sync/branch/mod.rs

@@ -24,7 +24,7 @@ pub fn rename_branch(
 
 #[cfg(test)]
 mod test {
-	use super::super::*;
+	use super::super::{checkout_branch, create_branch, RepoPath};
 	use super::rename_branch;
 	use crate::sync::tests::repo_init;
 
@@ -42,7 +42,7 @@ mod test {
 		assert_eq!(
 			repo.branches(None)
 				.unwrap()
-				.nth(0)
+				.next()
 				.unwrap()
 				.unwrap()
 				.0
@@ -58,7 +58,7 @@ mod test {
 		assert_eq!(
 			repo.branches(None)
 				.unwrap()
-				.nth(0)
+				.next()
 				.unwrap()
 				.unwrap()
 				.0