Merge branch 'gitui-org:master' into feat-adjusting-size-status-tab

Author: Hari-Oggy

Cargo.lock

@@ -94,7 +94,7 @@ clippy:
 clippy-nightly:
 	cargo +nightly clippy --workspace --all-features
 
-check: fmt clippy test sort
+check: fmt clippy test sort deny
 
 check-nightly:
 	cargo +nightly c

Makefile

@@ -24,7 +24,7 @@ easy-cast = "0.5"
 fuzzy-matcher = "0.3"
 git2 = "0.20"
 git2-hooks = { path = "../git2-hooks", version = ">=0.6" }
-gix = { version = "0.75.0", default-features = false, features = [
+gix = { version = "0.77.0", default-features = false, features = [
     "max-performance",
     "revision",
     "mailmap",

assets/logo.svg

@@ -177,7 +177,7 @@ pub fn get_commit_info(
 
 	let message = gix_get_message(&commit_ref, None);
 
-	let author = commit_ref.author();
+	let author = commit_ref.author()?;
 
 	let author = mailmap.try_resolve(author).map_or_else(
 		|| author.name.into(),
@@ -187,7 +187,7 @@ pub fn get_commit_info(
 	Ok(CommitInfo {
 		message,
 		author: author.to_string(),
-		time: commit_ref.time().seconds,
+		time: commit_ref.time()?.seconds,
 		id: commit.id().detach().into(),
 	})
 }

asyncgit/Cargo.toml

@@ -202,7 +202,11 @@ pub fn get_status(
 			let iter = status.into_index_worktree_iter(Vec::new())?;
 
 			for item in iter {
-				let item = item?;
+				let Ok(item) = item else {
+					log::warn!("[status] the status iter returned an error for an item: {item:?}");
+
+					continue;
+				};
 
 				let status = item.summary().map(Into::into);
 

asyncgit/src/sync/commits_info.rs

@@ -20,7 +20,9 @@ ignore = [
     # Crate paste is unmaintained. The dependency is already removed in
     # ratatui:master. Until a new release is available, ignore this in
     # order to pass CI. (https://github.com/gitui-org/gitui/issues/2554)
-    { id = "RUSTSEC-2024-0436", reason = "The paste dependency is already removed from ratatui." }
+    { id = "RUSTSEC-2024-0436", reason = "The paste dependency is already removed from ratatui." },
+    # See https://github.com/trishume/syntect/issues/606
+    { id = "RUSTSEC-2025-0141", reason = "Only brought in via syntect" },
 ]
 
 [bans]

asyncgit/src/sync/status.rs

@@ -74,6 +74,7 @@ pub struct Revlog {
 	key_config: SharedKeyConfig,
 	sender: Sender<AsyncGitNotification>,
 	theme: SharedTheme,
+	commit_list_percentage: u16,
 }
 
 impl Revlog {
@@ -107,6 +108,7 @@ impl Revlog {
 			key_config: env.key_config.clone(),
 			sender: env.sender_git.clone(),
 			theme: env.theme.clone(),
+			commit_list_percentage: 60,
 		}
 	}
 
@@ -424,8 +426,12 @@ impl DrawableComponent for Revlog {
 			.direction(Direction::Horizontal)
 			.constraints(
 				[
-					Constraint::Percentage(60),
-					Constraint::Percentage(40),
+					Constraint::Percentage(
+						self.commit_list_percentage,
+					),
+					Constraint::Percentage(
+						100 - self.commit_list_percentage,
+					),
 				]
 				.as_ref(),
 			)
@@ -461,6 +467,20 @@ impl Component for Revlog {
 					self.commit_details.toggle_visible()?;
 					self.update()?;
 					return Ok(EventState::Consumed);
+				} else if key_match(k, self.key_config.keys.alt_left)
+				{
+					if self.commit_list_percentage > 10 {
+						self.commit_list_percentage -= 5;
+						self.update()?;
+					}
+					return Ok(EventState::Consumed);
+				} else if key_match(k, self.key_config.keys.alt_right)
+				{
+					if self.commit_list_percentage < 90 {
+						self.commit_list_percentage += 5;
+						self.update()?;
+					}
+					return Ok(EventState::Consumed);
 				} else if key_match(
 					k,
 					self.key_config.keys.exit_popup,

deny.toml

@@ -988,9 +988,9 @@ impl Component for Status {
 							&mut self.vertical_split_index
 						}
 					};
-					if *bottom > 10 {
-						*top += 5;
-						*bottom -= 5;
+					if *top > 10 {
+						*top -= 5;
+						*bottom += 5;
 					}
 					Ok(EventState::Consumed)
 				} else if key_match(k, self.key_config.keys.alt_down)
@@ -1003,9 +1003,9 @@ impl Component for Status {
 							&mut self.vertical_split_index
 						}
 					};
-					if *top > 10 {
-						*top -= 5;
-						*bottom += 5;
+					if *bottom > 10 {
+						*top += 5;
+						*bottom -= 5;
 					}
 					Ok(EventState::Consumed)
 				} else {