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))
+* 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))
 * Select syntax highlighting theme out of the defaults from syntect [[@vasilismanol](https://github.com/vasilismanol)] ([#1931](https://github.com/extrawurst/gitui/issues/1931))
@@ -34,6 +35,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * resolve `core.hooksPath` relative to `GIT_WORK_TREE` [[@naseschwarz](https://github.com/naseschwarz)] ([#2571](https://github.com/gitui-org/gitui/issues/2571))
 * yanking commit ranges no longer generates incorrect dotted range notations, but lists each individual commit [[@naseschwarz](https://github.com/naseschwarz)] (https://github.com/gitui-org/gitui/issues/2576)
 * print slightly nicer errors when failing to create a directory [[@linkmauve](https://github.com/linkmauve)] (https://github.com/gitui-org/gitui/pull/2728)
+* When the terminal is insufficient to display all the commands, the cmdbar_bg configuration color does not fully take effect. ([#2347](https://github.com/extrawurst/gitui/issues/2347))
+* disable blame and history popup keybinds for untracked files [[@kpbaks](https://github.com/kpbaks)] ([#2489](https://github.com/gitui-org/gitui/pull/2489))
 
 ## [0.27.0] - 2024-01-14
 

Cargo.lock

@@ -82,7 +82,7 @@ two-face = { version = "0.4.3", default-features = false }
 unicode-segmentation = "1.12"
 unicode-truncate = "2.0"
 unicode-width = "0.2"
-which = "7.0"
+which = "8.0"
 
 [build-dependencies]
 chrono = { version = "0.4", default-features = false, features = ["clock"] }

Cargo.toml

@@ -20,7 +20,6 @@ enum DrawListEntry {
 struct Command {
 	txt: String,
 	enabled: bool,
-	line: usize,
 }
 
 /// helper to be used while drawing
@@ -106,7 +105,6 @@ impl CommandBar {
 			self.draw_list.push(DrawListEntry::Command(Command {
 				txt: c.text.name.clone(),
 				enabled: c.enabled,
-				line: lines.saturating_sub(1) as usize,
 			}));
 		}
 
@@ -157,9 +155,7 @@ impl CommandBar {
 							DrawListEntry::Command(c) => {
 								Span::styled(
 									Cow::from(c.txt.as_str()),
-									self.theme.commandbar(
-										c.enabled, c.line,
-									),
+									self.theme.commandbar(c.enabled),
 								)
 							}
 							DrawListEntry::LineBreak => {

src/cmdbar.rs

@@ -369,6 +369,18 @@ impl Component for DetailsComponent {
 						self.key_config.keys.move_down,
 					) {
 						self.move_scroll_top(ScrollType::Down).into()
+					} else if key_match(
+						e,
+						self.key_config.keys.page_up,
+					) {
+						self.move_scroll_top(ScrollType::PageUp)
+							.into()
+					} else if key_match(
+						e,
+						self.key_config.keys.page_down,
+					) {
+						self.move_scroll_top(ScrollType::PageDown)
+							.into()
 					} else if key_match(e, self.key_config.keys.home)
 						|| key_match(e, self.key_config.keys.shift_up)
 					{

src/components/commit_details/details.rs

@@ -308,6 +308,25 @@ impl StatusTreeComponent {
 			}
 		}
 	}
+
+	fn open_history(&mut self) {
+		match self.selection_file() {
+			Some(status_item)
+				if !matches!(
+					status_item.status,
+					StatusItemType::New
+				) =>
+			{
+				self.hide();
+				self.queue.push(InternalEvent::OpenPopup(
+					StackablePopupOpen::FileRevlog(FileRevOpen::new(
+						status_item.path,
+					)),
+				));
+			}
+			_ => {}
+		}
+	}
 }
 
 /// Used for drawing the `FileTreeComponent`
@@ -395,20 +414,27 @@ impl Component for StatusTreeComponent {
 		out: &mut Vec<CommandInfo>,
 		force_all: bool,
 	) -> CommandBlocking {
+		let available = self.focused || force_all;
+		let selection = self.selection_file();
+		let selected_is_file = selection.is_some();
+		let tracked = selection.is_some_and(|s| {
+			!matches!(s.status, StatusItemType::New)
+		});
+
 		out.push(
 			CommandInfo::new(
 				strings::commands::navigate_tree(&self.key_config),
 				!self.is_empty(),
-				self.focused || force_all,
+				available,
 			)
 			.order(order::NAV),
 		);
 
 		out.push(
 			CommandInfo::new(
 				strings::commands::blame_file(&self.key_config),
-				self.selection_file().is_some(),
-				self.focused || force_all,
+				selected_is_file && tracked,
+				available,
 			)
 			.order(order::RARE_ACTION),
 		);
@@ -418,62 +444,67 @@ impl Component for StatusTreeComponent {
 				strings::commands::open_file_history(
 					&self.key_config,
 				),
-				self.selection_file().is_some(),
-				self.focused || force_all,
+				selected_is_file && tracked,
+				available,
 			)
 			.order(order::RARE_ACTION),
 		);
 
 		out.push(
 			CommandInfo::new(
 				strings::commands::edit_item(&self.key_config),
-				self.selection_file().is_some(),
-				self.focused || force_all,
+				selected_is_file,
+				available,
 			)
 			.order(order::RARE_ACTION),
 		);
 
 		out.push(
 			CommandInfo::new(
 				strings::commands::copy_path(&self.key_config),
-				self.selection_file().is_some(),
-				self.focused || force_all,
+				selected_is_file,
+				available,
 			)
 			.order(order::RARE_ACTION),
 		);
 
 		CommandBlocking::PassingOn
 	}
 
+	#[expect(clippy::cognitive_complexity)]
 	fn event(&mut self, ev: &Event) -> Result<EventState> {
 		if self.focused {
 			if let Event::Key(e) = ev {
 				return if key_match(e, self.key_config.keys.blame) {
-					if let Some(status_item) = self.selection_file() {
-						self.hide();
-						self.queue.push(InternalEvent::OpenPopup(
-							StackablePopupOpen::BlameFile(
-								BlameFileOpen {
-									file_path: status_item.path,
-									commit_id: self.revision,
-									selection: None,
-								},
-							),
-						));
+					match self.selection_file() {
+						Some(status_item)
+							if !matches!(
+								status_item.status,
+								StatusItemType::New
+							) =>
+						{
+							self.hide();
+							self.queue.push(
+								InternalEvent::OpenPopup(
+									StackablePopupOpen::BlameFile(
+										BlameFileOpen {
+											file_path: status_item
+												.path,
+											commit_id: self.revision,
+											selection: None,
+										},
+									),
+								),
+							);
+						}
+						_ => {}
 					}
 					Ok(EventState::Consumed)
 				} else if key_match(
 					e,
 					self.key_config.keys.file_history,
 				) {
-					if let Some(status_item) = self.selection_file() {
-						self.hide();
-						self.queue.push(InternalEvent::OpenPopup(
-							StackablePopupOpen::FileRevlog(
-								FileRevOpen::new(status_item.path),
-							),
-						));
-					}
+					self.open_history();
 					Ok(EventState::Consumed)
 				} else if key_match(e, self.key_config.keys.edit_file)
 				{

src/components/status_tree.rs

@@ -8,13 +8,15 @@ use std::cell::Cell;
 pub struct VerticalScroll {
 	top: Cell<usize>,
 	max_top: Cell<usize>,
+	visual_height: Cell<usize>,
 }
 
 impl VerticalScroll {
 	pub const fn new() -> Self {
 		Self {
 			top: Cell::new(0),
 			max_top: Cell::new(0),
+			visual_height: Cell::new(0),
 		}
 	}
 
@@ -33,9 +35,14 @@ impl VerticalScroll {
 		let new_scroll_top = match move_type {
 			ScrollType::Down => old.saturating_add(1),
 			ScrollType::Up => old.saturating_sub(1),
+			ScrollType::PageDown => old
+				.saturating_sub(1)
+				.saturating_add(self.visual_height.get()),
+			ScrollType::PageUp => old
+				.saturating_add(1)
+				.saturating_sub(self.visual_height.get()),
 			ScrollType::Home => 0,
 			ScrollType::End => max,
-			_ => old,
 		};
 
 		let new_scroll_top = new_scroll_top.clamp(0, max);
@@ -81,6 +88,8 @@ impl VerticalScroll {
 		selection_max: usize,
 		visual_height: usize,
 	) -> usize {
+		self.visual_height.set(visual_height);
+
 		let new_top = calc_scroll_top(
 			self.get_top(),
 			visual_height,
@@ -192,4 +201,26 @@ mod tests {
 		scroll.move_area_to_visible(visual_height, 0, 2);
 		assert_eq!(scroll.get_top(), 0);
 	}
+
+	#[test]
+	fn test_scroll_with_pageup_pagedown() {
+		let scroll = VerticalScroll::new();
+		scroll.max_top.set(10);
+		scroll.visual_height.set(8);
+
+		assert!(scroll.move_top(ScrollType::End));
+		assert_eq!(scroll.get_top(), 10);
+
+		assert!(!scroll.move_top(ScrollType::PageDown));
+		assert_eq!(scroll.get_top(), 10);
+
+		assert!(scroll.move_top(ScrollType::PageUp));
+		assert_eq!(scroll.get_top(), 3);
+
+		assert!(scroll.move_top(ScrollType::PageUp));
+		assert_eq!(scroll.get_top(), 0);
+
+		assert!(!scroll.move_top(ScrollType::PageUp));
+		assert_eq!(scroll.get_top(), 0);
+	}
 }

src/components/utils/scroll_vertical.rs

@@ -40,10 +40,6 @@ impl KeyConfig {
 		Ok(Self { keys, symbols })
 	}
 
-	#[expect(
-		clippy::missing_const_for_fn,
-		reason = "as of 1.86.0 clippy wants this to be const even though that breaks"
-	)]
 	fn get_key_symbol(&self, k: KeyCode) -> &str {
 		match k {
 			KeyCode::Enter => &self.symbols.enter,
@@ -110,10 +106,6 @@ impl KeyConfig {
 		}
 	}
 
-	#[expect(
-		clippy::missing_const_for_fn,
-		reason = "as of 1.86.0 clippy wants this to be const even though that breaks"
-	)]
 	fn get_modifier_hint(&self, modifier: KeyModifiers) -> &str {
 		match modifier {
 			KeyModifiers::CONTROL => &self.symbols.control,

src/keys/key_config.rs

@@ -41,10 +41,6 @@ struct SyntaxFileBlame {
 }
 
 impl SyntaxFileBlame {
-	#[expect(
-		clippy::missing_const_for_fn,
-		reason = "as of 1.86.0 clippy wants this to be const even though that breaks"
-	)]
 	fn path(&self) -> &str {
 		&self.file_blame.path
 	}

src/popups/blame_file.rs

@@ -18,7 +18,6 @@ pub struct Theme {
 	selection_fg: Color,
 	use_selection_fg: bool,
 	cmdbar_bg: Color,
-	cmdbar_extra_lines_bg: Color,
 	disabled_fg: Color,
 	diff_line_add: Color,
 	diff_line_delete: Color,
@@ -211,17 +210,13 @@ impl Theme {
 		self.line_break.clone()
 	}
 
-	pub fn commandbar(&self, enabled: bool, line: usize) -> Style {
+	pub fn commandbar(&self, enabled: bool) -> Style {
 		if enabled {
 			Style::default().fg(self.command_fg)
 		} else {
 			Style::default().fg(self.disabled_fg)
 		}
-		.bg(if line == 0 {
-			self.cmdbar_bg
-		} else {
-			self.cmdbar_extra_lines_bg
-		})
+		.bg(self.cmdbar_bg)
 	}
 
 	pub fn commit_hash(&self, selected: bool) -> Style {
@@ -347,7 +342,6 @@ impl Default for Theme {
 			selection_fg: Color::White,
 			use_selection_fg: true,
 			cmdbar_bg: Color::Blue,
-			cmdbar_extra_lines_bg: Color::Blue,
 			disabled_fg: Color::DarkGray,
 			diff_line_add: Color::Green,
 			diff_line_delete: Color::Red,