From 9c433b4de3939acae185b09f5d754e778dd8b4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20R=C3=BC=C3=9Fler?= Date: Tue, 15 Oct 2024 20:20:03 +0200 Subject: [PATCH 01/15] Add test for AsyncLog respecting GIT_DIR (#2387) --- asyncgit/src/revlog.rs | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/asyncgit/src/revlog.rs b/asyncgit/src/revlog.rs index 0a2a2d3680..af18432385 100644 --- a/asyncgit/src/revlog.rs +++ b/asyncgit/src/revlog.rs @@ -331,6 +331,8 @@ mod tests { use std::time::Duration; use crossbeam_channel::unbounded; + use serial_test::serial; + use tempfile::TempDir; use crate::sync::tests::{debug_cmd_print, repo_init}; use crate::sync::RepoPath; @@ -368,4 +370,37 @@ mod tests { assert!(result.is_ok()); } + + #[test] + #[serial] + fn test_env_variables() { + let (_td, repo) = repo_init().unwrap(); + let git_dir = repo.path(); + + let (tx_git, _rx_git) = unbounded(); + + let empty_dir = TempDir::new().unwrap(); + let empty_path: RepoPath = + empty_dir.path().to_str().unwrap().into(); + + let arc_current = Arc::new(Mutex::new(AsyncLogResult { + commits: Vec::new(), + duration: Duration::default(), + })); + let arc_background = Arc::new(AtomicBool::new(false)); + + std::env::set_var("GIT_DIR", git_dir); + + let result = AsyncLog::fetch_helper_without_filter( + // We pass an empty path, thus testing whether `GIT_DIR`, set above, is taken into account. + &empty_path, + &arc_current, + &arc_background, + &tx_git, + ); + + std::env::remove_var("GIT_DIR"); + + assert!(result.is_ok()); + } } From 15e444ee3a5b947613478f1d4b3b15e1a58666e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:19:36 +0200 Subject: [PATCH 02/15] Bump ssh-key from 0.6.6 to 0.6.7 (#2390) Bumps [ssh-key](https://github.com/RustCrypto/SSH) from 0.6.6 to 0.6.7. - [Commits](https://github.com/RustCrypto/SSH/compare/ssh-key/v0.6.6...ssh-key/v0.6.7) --- updated-dependencies: - dependency-name: ssh-key dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- asyncgit/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c568548fa4..4f67b4e0f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2897,9 +2897,9 @@ dependencies = [ [[package]] name = "ssh-key" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc" +checksum = "3b86f5297f0f04d08cabaa0f6bff7cb6aec4d9c3b49d87990d63da9d9156a8c3" dependencies = [ "bcrypt-pbkdf", "ed25519-dalek", diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml index 9a3b5d2bd2..ce7f2b934b 100644 --- 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" From 3643e80d5cfbba6ec93b7c606c693a44d7c7f050 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:20:13 +0200 Subject: [PATCH 03/15] Bump openssl-sys from 0.9.103 to 0.9.104 (#2391) Bumps [openssl-sys](https://github.com/sfackler/rust-openssl) from 0.9.103 to 0.9.104. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-sys-v0.9.103...openssl-sys-v0.9.104) --- updated-dependencies: - dependency-name: openssl-sys dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f67b4e0f5..1dfe743ea5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2168,9 +2168,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", From c4f517acb5724c828f30b9bf5a4da81950550ceb Mon Sep 17 00:00:00 2001 From: extrawurst Date: Thu, 17 Oct 2024 11:28:40 +0200 Subject: [PATCH 04/15] Revert "Add test for AsyncLog respecting GIT_DIR (#2387)" This reverts commit 9c433b4de3939acae185b09f5d754e778dd8b4a6. --- asyncgit/src/revlog.rs | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/asyncgit/src/revlog.rs b/asyncgit/src/revlog.rs index af18432385..0a2a2d3680 100644 --- a/asyncgit/src/revlog.rs +++ b/asyncgit/src/revlog.rs @@ -331,8 +331,6 @@ mod tests { use std::time::Duration; use crossbeam_channel::unbounded; - use serial_test::serial; - use tempfile::TempDir; use crate::sync::tests::{debug_cmd_print, repo_init}; use crate::sync::RepoPath; @@ -370,37 +368,4 @@ mod tests { assert!(result.is_ok()); } - - #[test] - #[serial] - fn test_env_variables() { - let (_td, repo) = repo_init().unwrap(); - let git_dir = repo.path(); - - let (tx_git, _rx_git) = unbounded(); - - let empty_dir = TempDir::new().unwrap(); - let empty_path: RepoPath = - empty_dir.path().to_str().unwrap().into(); - - let arc_current = Arc::new(Mutex::new(AsyncLogResult { - commits: Vec::new(), - duration: Duration::default(), - })); - let arc_background = Arc::new(AtomicBool::new(false)); - - std::env::set_var("GIT_DIR", git_dir); - - let result = AsyncLog::fetch_helper_without_filter( - // We pass an empty path, thus testing whether `GIT_DIR`, set above, is taken into account. - &empty_path, - &arc_current, - &arc_background, - &tx_git, - ); - - std::env::remove_var("GIT_DIR"); - - assert!(result.is_ok()); - } } From d7765c4239bebb0f3d8d2df741a2edc701f73318 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Fri, 18 Oct 2024 18:02:02 +0200 Subject: [PATCH 05/15] fix doc comments to please new rust version lints --- asyncgit/src/sync/hooks.rs | 12 ++++-------- git2-hooks/src/lib.rs | 6 ++++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/asyncgit/src/sync/hooks.rs b/asyncgit/src/sync/hooks.rs index b692891853..3e82cf6f8d 100644 --- a/asyncgit/src/sync/hooks.rs +++ b/asyncgit/src/sync/hooks.rs @@ -26,10 +26,7 @@ impl From for HookResult { } } -/// this hook is documented here -/// 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 -/// +/// see `git2_hooks::hooks_pre_commit` pub fn hooks_pre_commit(repo_path: &RepoPath) -> Result { scope_time!("hooks_pre_commit"); @@ -51,7 +47,7 @@ pub fn hooks_pre_commit(repo_path: &RepoPath) -> Result { Ok(git2_hooks::hooks_pre_commit(&repo, None)?.into()) } -/// +/// see `git2_hooks::hooks_post_commit` pub fn hooks_post_commit(repo_path: &RepoPath) -> Result { scope_time!("hooks_post_commit"); @@ -60,7 +56,7 @@ pub fn hooks_post_commit(repo_path: &RepoPath) -> Result { 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/git2-hooks/src/lib.rs b/git2-hooks/src/lib.rs index 43e5e18f2c..2a458856d7 100644 --- 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 -/// we use the same convention as other git clients to create a temp file containing +/// Git hook: `commit_msg` +/// +/// This hook is documented here . +/// 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( From ba9adf40f4d6af6792a699d0e6f1d92367f30d0e Mon Sep 17 00:00:00 2001 From: extrawurst Date: Fri, 18 Oct 2024 18:02:51 +0200 Subject: [PATCH 06/15] fix yanked crate --- Cargo.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1dfe743ea5..eb159d3bd4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -919,9 +919,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -929,9 +929,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" @@ -946,27 +946,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", From fb1ba7c0b952a351b30e1ea9b50d7e2298d53c72 Mon Sep 17 00:00:00 2001 From: wugeer <1284057728@qq.com> Date: Sat, 19 Oct 2024 00:07:35 +0800 Subject: [PATCH 07/15] feat: help popup display viewing progress (#2388) --- CHANGELOG.md | 1 + src/popups/help.rs | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e89e1af6cb..0de765f2be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ Checkout [THEMES.md](./THEMES.md) for more info. ### Added * due to github runner changes, the regular mac build is now arm64, so we added support for intel x86 apple build in nightlies and releases (via separat artifact) * support `BUILD_GIT_COMMIT_ID` enabling builds from `git archive` generated source tarballs or other outside a git repo [[@alerque](https://github.com/alerque)] ([#2187](https://github.com/extrawurst/gitui/pull/2187)) +* support help popup display viewing progress[[@wugeer](https://github.com/wugeer)](https://github.com/extrawurst/gitui/pull/2388)) ### Fixes * update yanked dependency to `libc` to fix building with `--locked`. diff --git a/src/popups/help.rs b/src/popups/help.rs index ebf687ad5e..9e9b702e71 100644 --- a/src/popups/help.rs +++ b/src/popups/help.rs @@ -67,6 +67,15 @@ impl DrawableComponent for HelpPopup { chunks[0], ); + ui::draw_scrollbar( + f, + area, + &self.theme, + self.cmds.len(), + self.selection as usize, + ui::Orientation::Vertical, + ); + f.render_widget( Paragraph::new(Line::from(vec![Span::styled( Cow::from(format!( From e7be093c391f9c07ec5d033e8785286f6172adf0 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Fri, 18 Oct 2024 18:08:36 +0200 Subject: [PATCH 08/15] fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0de765f2be..59b1710c60 100644 --- 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 @@ -38,7 +39,6 @@ Checkout [THEMES.md](./THEMES.md) for more info. ### Added * due to github runner changes, the regular mac build is now arm64, so we added support for intel x86 apple build in nightlies and releases (via separat artifact) * support `BUILD_GIT_COMMIT_ID` enabling builds from `git archive` generated source tarballs or other outside a git repo [[@alerque](https://github.com/alerque)] ([#2187](https://github.com/extrawurst/gitui/pull/2187)) -* support help popup display viewing progress[[@wugeer](https://github.com/wugeer)](https://github.com/extrawurst/gitui/pull/2388)) ### Fixes * update yanked dependency to `libc` to fix building with `--locked`. From 1866bf5f89ff2392b10cd8ce6d39e9b1c43eab62 Mon Sep 17 00:00:00 2001 From: extrawurst Date: Fri, 18 Oct 2024 18:14:21 +0200 Subject: [PATCH 09/15] spaces to tabs --- src/keys/symbols.rs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/keys/symbols.rs b/src/keys/symbols.rs index 8bdb7b50dc..de9d38fc53 100644 --- a/src/keys/symbols.rs +++ b/src/keys/symbols.rs @@ -30,23 +30,23 @@ impl Default for KeySymbols { fn default() -> Self { Self { enter: "\u{23ce}".into(), //⏎ - left: "\u{2190}".into(), //← - right: "\u{2192}".into(), //→ - up: "\u{2191}".into(), //↑ - down: "\u{2193}".into(), //↓ - backspace: "\u{232b}".into(), //⌫ - home: "\u{2912}".into(), //⤒ - end: "\u{2913}".into(), //⤓ - page_up: "\u{21de}".into(), //⇞ - page_down: "\u{21df}".into(), //⇟ - tab: "\u{21e5}".into(), //⇥ - back_tab: "\u{21e4}".into(), //⇤ - delete: "\u{2326}".into(), //⌦ - insert: "\u{2380}".into(), //⎀ - esc: "\u{238b}".into(), //⎋ - control: "^".into(), - shift: "\u{21e7}".into(), //⇧ - alt: "\u{2325}".into(), //⌥ + left: "\u{2190}".into(), //← + right: "\u{2192}".into(), //→ + up: "\u{2191}".into(), //↑ + down: "\u{2193}".into(), //↓ + backspace: "\u{232b}".into(), //⌫ + home: "\u{2912}".into(), //⤒ + end: "\u{2913}".into(), //⤓ + page_up: "\u{21de}".into(), //⇞ + page_down: "\u{21df}".into(), //⇟ + tab: "\u{21e5}".into(), //⇥ + back_tab: "\u{21e4}".into(), //⇤ + delete: "\u{2326}".into(), //⌦ + insert: "\u{2380}".into(), //⎀ + esc: "\u{238b}".into(), //⎋ + control: "^".into(), + shift: "\u{21e7}".into(), //⇧ + alt: "\u{2325}".into(), //⌥ } } } From 1346e5594c33dc8e37735ef10ba2f870cb8f2f8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 09:19:31 +0200 Subject: [PATCH 10/15] Bump anyhow from 1.0.89 to 1.0.90 (#2394) Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.89 to 1.0.90. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.89...1.0.90) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eb159d3bd4..5ce9d7e977 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,9 +145,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arc-swap" From b4c0244a2acab14e358f5a6d5170ec635c95d106 Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Mon, 21 Oct 2024 15:20:17 +0800 Subject: [PATCH 11/15] Bump struct-patch from 0.4.1 to 0.8.6 (#2386) --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- src/keys/key_list.rs | 2 +- src/ui/style.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5ce9d7e977..6bc32a0a26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2932,18 +2932,18 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "struct-patch" -version = "0.4.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c52ef523e89b3172242bbabefd8a92493ae5571224c29ed2f00185c39b395c2" +checksum = "82dd71e677fa313d07db38f4c7f9a38f89dfb90be8f35914956919f6ca7b9174" dependencies = [ "struct-patch-derive", ] [[package]] name = "struct-patch-derive" -version = "0.4.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14a349c27ebe59faba22f933c9c734d428da7231e88a247e9d8c61eea964ddb" +checksum = "4596646090f0d724e6c7f3b65d694f99a0daa1a5893a78ef83887025e041405c" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 7063d95ddb..a7fc3fd908 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,7 @@ 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", diff --git a/src/keys/key_list.rs b/src/keys/key_list.rs index 2903499587..0f2909a2fe 100644 --- 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, diff --git a/src/ui/style.rs b/src/ui/style.rs index 2d311af728..839ec380fb 100644 --- a/src/ui/style.rs +++ b/src/ui/style.rs @@ -9,7 +9,7 @@ use struct_patch::Patch; pub type SharedTheme = Rc; #[derive(Serialize, Deserialize, Debug, Clone, Patch)] -#[patch_derive(Serialize, Deserialize)] +#[patch(attribute(derive(Serialize, Deserialize)))] pub struct Theme { selected_tab: Color, command_fg: Color, From d85c6a7eac679bd2e432e7d3b002f9801911ca8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:22:24 +0200 Subject: [PATCH 12/15] Bump thiserror from 1.0.64 to 1.0.65 (#2400) Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.64 to 1.0.65. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.64...1.0.65) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6bc32a0a26..67e7cdc935 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3035,18 +3035,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", From a226611eaed6761ee6d285bf96d8a7f53c383e03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:22:36 +0200 Subject: [PATCH 13/15] Bump anyhow from 1.0.90 to 1.0.91 (#2401) Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.90 to 1.0.91. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.90...1.0.91) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67e7cdc935..02ad854110 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,9 +145,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "arc-swap" From a923896a625c39a4bd5b33eadd0d4e6bddefb687 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 08:23:13 +0200 Subject: [PATCH 14/15] Bump serde from 1.0.210 to 1.0.213 (#2399) Bumps [serde](https://github.com/serde-rs/serde) from 1.0.210 to 1.0.213. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.210...v1.0.213) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02ad854110..22d5000742 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2673,18 +2673,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", @@ -2980,9 +2980,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.70" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", From 603116f491843d93726484e48d6e24d2d809f84d Mon Sep 17 00:00:00 2001 From: extrawurst <776816+extrawurst@users.noreply.github.com> Date: Wed, 23 Oct 2024 09:34:24 +0200 Subject: [PATCH 15/15] ratatui update (#2403) --- Cargo.lock | 32 ++++++++++++++++++++++---------- Cargo.toml | 6 +++--- deny.toml | 10 +++++++++- src/popups/blame_file.rs | 2 +- src/popups/file_revlog.rs | 2 +- src/popups/taglist.rs | 2 +- 6 files changed, 37 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22d5000742..aecae7958f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -341,7 +341,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d13da3319ae5c5771712fba7b79b028793149bc462a08990bc8fd7c7554dbb95" dependencies = [ - "unicode-width", + "unicode-width 0.1.13", ] [[package]] @@ -1138,7 +1138,7 @@ dependencies = [ "two-face", "unicode-segmentation", "unicode-truncate", - "unicode-width", + "unicode-width 0.2.0", "which", ] @@ -1736,6 +1736,12 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + [[package]] name = "inotify" version = "0.9.6" @@ -2442,24 +2448,24 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", "crossterm", + "indoc", "instability", "itertools", "lru", "paste", "serde", "strum", - "strum_macros", "unicode-segmentation", "unicode-truncate", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] @@ -3111,13 +3117,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tui-textarea" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c07084342a575cea919eea996b9658a358c800b03d435df581c1d7c60e065a" +checksum = "0a5318dd619ed73c52a9417ad19046724effc1287fb75cdcc4eca1d6ac1acbae" dependencies = [ "crossterm", "ratatui", - "unicode-width", + "unicode-width 0.2.0", ] [[package]] @@ -3187,7 +3193,7 @@ checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" dependencies = [ "itertools", "unicode-segmentation", - "unicode-width", + "unicode-width 0.1.13", ] [[package]] @@ -3196,6 +3202,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "universal-hash" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index a7fc3fd908..9d25d31186 100644 --- 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', ] } @@ -57,11 +57,11 @@ syntect = { version = "5.2", default-features = false, features = [ "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/deny.toml b/deny.toml index 61616cc18a..257eb3fcf3 100644 --- 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/src/popups/blame_file.rs b/src/popups/blame_file.rs index 34143481fc..6ed319a144 100644 --- a/src/popups/blame_file.rs +++ b/src/popups/blame_file.rs @@ -138,7 +138,7 @@ impl DrawableComponent for BlameFilePopup { let table = Table::new(rows, constraints) .column_spacing(1) - .highlight_style(self.theme.text(true, true)) + .row_highlight_style(self.theme.text(true, true)) .block( Block::default() .borders(Borders::ALL) diff --git a/src/popups/file_revlog.rs b/src/popups/file_revlog.rs index 1bfc0b266e..b81a7643e4 100644 --- a/src/popups/file_revlog.rs +++ b/src/popups/file_revlog.rs @@ -391,7 +391,7 @@ impl FileRevlogPopup { let table = Table::new(rows, constraints) .column_spacing(1) - .highlight_style(self.theme.text(true, true)) + .row_highlight_style(self.theme.text(true, true)) .block( Block::default() .borders(Borders::ALL) diff --git a/src/popups/taglist.rs b/src/popups/taglist.rs index 76fefb2d3d..e4d474e688 100644 --- a/src/popups/taglist.rs +++ b/src/popups/taglist.rs @@ -94,7 +94,7 @@ impl DrawableComponent for TagListPopup { let table = Table::new(rows, constraints) .column_spacing(1) - .highlight_style(self.theme.text(true, true)) + .row_highlight_style(self.theme.text(true, true)) .block( Block::default() .borders(Borders::ALL)