Merge branch 'master' into feat/checkout_method

Author: Fatpandac

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 * support choosing checkout branch method when status is not empty [[@fatpandac](https://github.com/fatpandac)] ([#2404](https://github.com/extrawurst/gitui/issues/2404))
+* Support pre-push hook [[@xlai89](https://github.com/xlai89)] ([#1933](https://github.com/extrawurst/gitui/issues/1933))
 * Message tab supports pageUp and pageDown  [[@xlai89](https://github.com/xlai89)] ([#2623](https://github.com/extrawurst/gitui/issues/2623))
 * Files and status tab support pageUp and pageDown  [[@fatpandac](https://github.com/fatpandac)] ([#1951](https://github.com/extrawurst/gitui/issues/1951))
 * support loading custom syntax highlighting themes from a file [[@acuteenvy](https://github.com/acuteenvy)] ([#2565](https://github.com/gitui-org/gitui/pull/2565))

Cargo.lock

@@ -55,21 +55,21 @@ indexmap = "2"
 itertools = "0.14"
 log = "0.4"
 notify = "8"
-notify-debouncer-mini = "0.6"
+notify-debouncer-mini = "0.7"
 once_cell = "1"
 parking_lot_core = "0.9"
 ratatui = { version = "0.29", default-features = false, features = [
     'crossterm',
     'serde',
 ] }
 rayon-core = "1.13"
-ron = "0.10"
+ron = "0.11"
 scopeguard = "1.2"
 scopetime = { path = "./scopetime", version = "0.1" }
 serde = "1.0"
 shellexpand = "3.1"
 simplelog = { version = "0.12", default-features = false }
-struct-patch = "0.9"
+struct-patch = "0.10"
 syntect = { version = "5.3", default-features = false, features = [
     "parsing",
     "default-syntaxes",
@@ -78,7 +78,7 @@ syntect = { version = "5.3", default-features = false, features = [
     "html",
 ] }
 tui-textarea = "0.7"
-two-face = { version = "0.4.3", default-features = false }
+two-face = { version = "0.4.4", default-features = false }
 unicode-segmentation = "1.12"
 unicode-truncate = "2.0"
 unicode-width = "0.2"

Cargo.toml

@@ -130,7 +130,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 			let self_clone = (*self).clone();
 			rayon_core::spawn(move || {
 				if let Err(e) = self_clone.run_job(task) {
-					log::error!("async job error: {}", e);
+					log::error!("async job error: {e}");
 				}
 			});
 

asyncgit/src/asyncjob/mod.rs

@@ -116,7 +116,7 @@ impl AsyncBlame {
 
 			let notify = match notify {
 				Err(err) => {
-					log::error!("get_blame_helper error: {}", err);
+					log::error!("get_blame_helper error: {err}");
 					true
 				}
 				Ok(notify) => notify,

asyncgit/src/blame.rs

@@ -89,7 +89,7 @@ impl AsyncCommitFiles {
 			return Ok(());
 		}
 
-		log::trace!("request: {:?}", params);
+		log::trace!("request: {params:?}");
 
 		{
 			let current = self.current.lock()?;

asyncgit/src/commit_files.rs

@@ -98,7 +98,7 @@ impl AsyncDiff {
 		&self,
 		params: DiffParams,
 	) -> Result<Option<FileDiff>> {
-		log::trace!("request {:?}", params);
+		log::trace!("request {params:?}");
 
 		let hash = hash(&params);
 
@@ -131,8 +131,8 @@ impl AsyncDiff {
 			);
 
 			let notify = match notify {
-				Err(err) => {
-					log::error!("get_diff_helper error: {}", err);
+				Err(e) => {
+					log::error!("get_diff_helper error: {e}");
 					true
 				}
 				Ok(notify) => notify,

asyncgit/src/diff.rs

@@ -33,7 +33,8 @@ It wraps libraries like git2 and gix.
 	clippy::module_name_repetitions,
 	clippy::must_use_candidate,
 	clippy::missing_errors_doc,
-	clippy::empty_docs
+	clippy::empty_docs,
+	clippy::unnecessary_debug_formatting
 )]
 //TODO:
 #![allow(

asyncgit/src/lib.rs

@@ -153,7 +153,7 @@ impl AsyncPull {
 		*last_res = match res {
 			Ok(bytes) => Some((bytes, String::new())),
 			Err(e) => {
-				log::error!("fetch error: {}", e);
+				log::error!("fetch error: {e}");
 				Some((0, e.to_string()))
 			}
 		};

asyncgit/src/pull.rs

@@ -164,7 +164,7 @@ impl AsyncPush {
 		*last_res = match res {
 			Ok(()) => None,
 			Err(e) => {
-				log::error!("push error: {}", e);
+				log::error!("push error: {e}",);
 				Some(e.to_string())
 			}
 		};