Merge branch 'master' into improve-test-for-env-variables

extrawurst · Oct 28, 2024 · 7d90564 · 7d90564
2 parents fef175a + 603116f
commit 7d90564
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Set `CREATE_NO_WINDOW` flag when executing Git hooks on Windows ([#2371](https://github.com/extrawurst/gitui/pull/2371))
 
 ### Added
+* help popup scrollbar [[@wugeer](https://github.com/wugeer)](https://github.com/extrawurst/gitui/pull/2388))
 * add popups for viewing, adding, updating and removing remotes [[@robin-thoene](https://github.com/robin-thoene)] ([#2172](https://github.com/extrawurst/gitui/issues/2172))
 
 ## [0.26.3] - 2024-06-02

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ notify-debouncer-mini = "0.4"
 once_cell = "1"
 # pin until upgrading this does not introduce a duplicate dependency
 parking_lot_core = "=0.9.9"
-ratatui = { version = "0.28", default-features = false, features = [
+ratatui = { version = "0.29", default-features = false, features = [
     'crossterm',
     'serde',
 ] }
@@ -50,18 +50,18 @@ scopetime = { path = "./scopetime", version = "0.1" }
 serde = "1.0"
 shellexpand = "3.1"
 simplelog = { version = "0.12", default-features = false }
-struct-patch = "0.4"
+struct-patch = "0.8"
 syntect = { version = "5.2", default-features = false, features = [
     "parsing",
     "default-syntaxes",
     "default-themes",
     "html",
 ] }
-tui-textarea = "0.6"
+tui-textarea = "0.7"
 two-face = { version = "0.4.0", default-features = false }
 unicode-segmentation = "1.12"
 unicode-truncate = "1.0"
-unicode-width = "0.1"
+unicode-width = "0.2"
 which = "6.0"
 
 [dev-dependencies]

diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
@@ -32,7 +32,7 @@ rayon = "1.10"
 rayon-core = "1.12"
 scopetime = { path = "../scopetime", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
-ssh-key = { version = "0.6.6", features = ["crypto", "encryption"] }
+ssh-key = { version = "0.6.7", features = ["crypto", "encryption"] }
 thiserror = "1.0"
 unicode-truncate = "1.0"
 url = "2.5"

diff --git a/asyncgit/src/sync/hooks.rs b/asyncgit/src/sync/hooks.rs
@@ -26,10 +26,7 @@ impl From<git2_hooks::HookResult> for HookResult {
 	}
 }
 
-/// this hook is documented here <https://git-scm.com/docs/githooks#_commit_msg>
-/// we use the same convention as other git clients to create a temp file containing
-/// the commit message at `<.git|hooksPath>/COMMIT_EDITMSG` and pass it's relative path as the only
-/// parameter to the hook script.
+/// see `git2_hooks::hooks_commit_msg`
 pub fn hooks_commit_msg(
 	repo_path: &RepoPath,
 	msg: &mut String,
@@ -41,8 +38,7 @@ pub fn hooks_commit_msg(
 	Ok(git2_hooks::hooks_commit_msg(&repo, None, msg)?.into())
 }
 
-/// this hook is documented here <https://git-scm.com/docs/githooks#_pre_commit>
-///
+/// see `git2_hooks::hooks_pre_commit`
 pub fn hooks_pre_commit(repo_path: &RepoPath) -> Result<HookResult> {
 	scope_time!("hooks_pre_commit");
 
@@ -51,7 +47,7 @@ pub fn hooks_pre_commit(repo_path: &RepoPath) -> Result<HookResult> {
 	Ok(git2_hooks::hooks_pre_commit(&repo, None)?.into())
 }
 
-///
+/// see `git2_hooks::hooks_post_commit`
 pub fn hooks_post_commit(repo_path: &RepoPath) -> Result<HookResult> {
 	scope_time!("hooks_post_commit");
 
@@ -60,7 +56,7 @@ pub fn hooks_post_commit(repo_path: &RepoPath) -> Result<HookResult> {
 	Ok(git2_hooks::hooks_post_commit(&repo, None)?.into())
 }
 
-///
+/// see `git2_hooks::hooks_prepare_commit_msg`
 pub fn hooks_prepare_commit_msg(
 	repo_path: &RepoPath,
 	source: PrepareCommitMsgSource,

diff --git a/deny.toml b/deny.toml
@@ -22,4 +22,12 @@ version = "1.0.3"
 
 [bans]
 multiple-versions = "deny"
-skip-tree = [{ name = "windows-sys" }, { name = "bitflags" }, { name = "mio" }]
+skip-tree = [
+    { name = "bitflags" },
+    # this is only needed for notify: https://github.com/notify-rs/notify/issues/648
+    { name = "mio" },
+    # this is needed for:
+    #  `bwrap v1.3.0` (https://github.com/micl2e2/bwrap/pull/4)
+    #  `unicode-truncate v1.1.0` (https://github.com/Aetf/unicode-truncate/pull/23)
+    { name = "unicode-width" },
+]
diff --git a/git2-hooks/src/lib.rs b/git2-hooks/src/lib.rs
@@ -112,8 +112,10 @@ fn create_hook_in_path(path: &Path, hook_script: &[u8]) {
 	}
 }
 
-/// this hook is documented here <https://git-scm.com/docs/githooks#_commit_msg>
-/// we use the same convention as other git clients to create a temp file containing
+/// Git hook: `commit_msg`
+///
+/// This hook is documented here <https://git-scm.com/docs/githooks#_commit_msg>.
+/// We use the same convention as other git clients to create a temp file containing
 /// the commit message at `<.git|hooksPath>/COMMIT_EDITMSG` and pass it's relative path as the only
 /// parameter to the hook script.
 pub fn hooks_commit_msg(

diff --git a/src/keys/key_list.rs b/src/keys/key_list.rs
@@ -35,7 +35,7 @@ impl From<&GituiKeyEvent> for KeyEvent {
 }
 
 #[derive(Debug, Clone, Patch)]
-#[patch_derive(Deserialize, Debug)]
+#[patch(attribute(derive(Deserialize, Debug)))]
 pub struct KeysList {
 	pub tab_status: GituiKeyEvent,
 	pub tab_log: GituiKeyEvent,