Cargo.lock

@@ -1118,7 +1118,6 @@ dependencies = [
  "pretty_assertions",
  "rand",
  "ratatui",
- "regex",
  "rstest",
  "secrecy",
  "sendmail",

Cargo.toml

@@ -32,7 +32,6 @@ directories = "5.0"
 lazy_static = "1.5"
 color-eyre = "0.6"
 tui-scrollview = "0.4"
-regex = "1.10"
 
 # CLI parsing
 clap = { version = "4.5", features = ["cargo", "derive"] }

crates/cli/Cargo.toml

@@ -16,7 +16,7 @@ categories = { workspace = true }
 default = ["forgejo", "github", "tui"]
 forgejo = ["git-next-forge-forgejo"]
 github = ["git-next-forge-github"]
-tui = ["ratatui", "directories", "lazy_static", "tui-scrollview", "regex"]
+tui = ["ratatui", "directories", "lazy_static", "tui-scrollview"]
 
 [dependencies]
 git-next-core = { workspace = true }
@@ -29,7 +29,6 @@ directories = { workspace = true, optional = true }
 lazy_static = { workspace = true, optional = true }
 color-eyre = { workspace = true }
 tui-scrollview = { workspace = true, optional = true }
-regex = { workspace = true, optional = true }
 
 # CLI parsing
 clap = { workspace = true }

crates/cli/src/tui/components/history.rs

@@ -1,13 +1,9 @@
-//
 use git_next_core::git::graph::Log;
-use lazy_static::lazy_static;
+//
 use ratatui::{
-    style::{Color, Style, Styled as _},
+    text::{Line, Text},
-    text::{Line, Span, Text},
     widgets::{Paragraph, Widget},
 };
-use regex::Regex;
-use tracing::info;
 
 use super::HeightContraintLength;
 
@@ -27,102 +23,10 @@ impl<'a> Widget for CommitLog<'a> {
         Paragraph::new(Text::from(
             self.log
                 .iter()
-                .map(LogLine::new)
+                .map(ToString::to_string)
                 .map(Line::from)
                 .collect::<Vec<_>>(),
         ))
         .render(area, buf);
     }
 }
-
-struct LogLine {
-    raw: String,
-}
-impl LogLine {
-    fn new(raw: impl Into<String>) -> Self {
-        Self { raw: raw.into() }
-    }
-}
-lazy_static::lazy_static! {
-    static ref RE: Regex =
-    #[allow(clippy::unwrap_used)]
-        Regex::new(
-            r"^(?<pre>.*)\s(?<hash>[0-9a-f]{7})\s\((?<branches>.*?)\)\s(?<message>.*)",
-        ).unwrap();
-
-    static ref BRANCHES: Regex =
-    #[allow(clippy::unwrap_used)]
-        Regex::new(
-            r"origin\/(?<branch>.*?)[,$]",
-        ).unwrap();
-}
-impl From<LogLine> for Line<'_> {
-    fn from(value: LogLine) -> Self {
-        if let Some(caps) = RE.captures(&value.raw) {
-            let pre = caps["pre"].to_owned();
-            let hash = caps["hash"].to_owned();
-            let message = caps["message"].to_owned();
-            let mut branches = BRANCHES
-                .captures_iter(&caps["branches"])
-                .map(|captures| captures["branch"].to_owned())
-                .collect::<Vec<_>>();
-            if branches.is_empty() {
-                // line without branches
-                Line::from(vec![
-                    pre.into(),
-                    " ".into(),
-                    hash.into(),
-                    " ".into(),
-                    message.into(),
-                ])
-            } else {
-                // line withbranches
-                let mut spans = vec![pre.into(), " ".into(), hash.into(), " ".into()];
-                branches.sort();
-                branches
-                    .into_iter()
-                    .map(|branch| Span::from(branch).style(Style::default().fg(Color::Blue)))
-                    .for_each(|span| {
-                        spans.push("[".into());
-                        spans.push(span);
-                        spans.push("]".into());
-                    });
-                spans.push(" ".into());
-                spans.push(message.into());
-                Line::from(spans)
-            }
-        } else {
-            // non-commit line
-            Line::from(value.raw.clone())
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use tracing::info;
-
-    use super::RE;
-
-    #[test_log::test]
-    fn parse_log_line() -> Result<(), Box<dyn std::error::Error>> {
-        let line = "* 97b6853 (origin/next, origin/main, origin/dev, origin/HEAD) refactor(tui): simplify repo identity widget";
-        RE.captures(line).map_or_else(
-            || Err("Failed to capture".into()),
-            |caps| {
-                info!(?caps, "");
-                assert_eq!(&caps["pre"], "*");
-                assert_eq!(&caps["hash"], "97b6853");
-                assert_eq!(&caps["branch1"], "next");
-                assert_eq!(&caps["branch2"], "main");
-                assert_eq!(&caps["branch3"], "dev");
-                assert_eq!(&caps["branch4"], "HEAD");
-                assert_eq!(
-                    &caps["message"],
-                    "refactor(tui): simplify repo identity widget"
-                );
-                Ok(())
-            },
-        )
-    }
-}

crates/cli/src/tui/components/repo/identity.rs

@@ -1,4 +1,6 @@
 //
+
+use color_eyre::owo_colors::OwoColorize;
 use git_next_core::{RepoAlias, RepoBranches};
 use ratatui::{
     layout::Alignment,