refactor: use libgit2 for showing commits

Cargo.toml

@@ -15,6 +15,7 @@ pprof = { version = "0.13.0", features = ["flamegraph", "criterion"] }
 
 [dependencies]
 ansi-to-tui = "3.1.0"
+chrono = "0.4.34"
 clap = { version = "4.4.16", features = ["derive"] }
 crossterm = "0.27.0"
 git2 = "0.18.2"

src/git/commit.rs

@@ -0,0 +1,5 @@
+#[derive(Debug)]
+pub(crate) struct Commit {
+    pub hash: String,
+    pub details: String,
+}

src/git/mod.rs

@@ -1,5 +1,12 @@
 use git2::{DiffLineType::*, Repository};
+use itertools::Itertools;
 
+use self::{
+    commit::Commit,
+    diff::{Delta, Diff, Hunk},
+    merge_status::MergeStatus,
+    rebase_status::RebaseStatus,
+};
 use crate::Res;
 use std::{
     error::Error,
@@ -10,12 +17,7 @@ use std::{
     str::{self, FromStr},
 };
 
-use self::{
-    diff::{Delta, Diff, Hunk},
-    merge_status::MergeStatus,
-    rebase_status::RebaseStatus,
-};
-
+pub(crate) mod commit;
 pub(crate) mod diff;
 pub(crate) mod merge_status;
 mod parse;
@@ -90,14 +92,15 @@ fn branch_name(dir: &Path, hash: &str) -> Res<Option<String>> {
 }
 
 pub(crate) fn diff(dir: &Path, args: &[&str]) -> Res<Diff> {
+    assert!(args.is_empty(), "TODO handle args");
     // TODO handle args?
     let repo = &Repository::open(dir)?;
     let diff = repo.diff_index_to_workdir(None, None)?;
     convert_diff(diff)
 }
 
 // TODO Move elsewhere
-pub(crate) fn convert_diff<'a>(diff: git2::Diff) -> Res<Diff> {
+pub(crate) fn convert_diff(diff: git2::Diff) -> Res<Diff> {
     let mut deltas = vec![];
     let mut lines = String::new();
 
@@ -126,7 +129,7 @@ pub(crate) fn convert_diff<'a>(diff: git2::Diff) -> Res<Diff> {
                 if is_new_hunk {
                     let delta = deltas.last_mut().unwrap();
 
-                    (*delta).hunks.push(Hunk {
+                    delta.hunks.push(Hunk {
                         file_header: delta.file_header.clone(),
                         old_file: delta.old_file.clone(),
                         new_file: delta.new_file.clone(),
@@ -149,7 +152,6 @@ pub(crate) fn convert_diff<'a>(diff: git2::Diff) -> Res<Diff> {
                         }
                         ContextEOFNL => {
                             // TODO Handle '\ No newline at the end of file'
-                            ()
                         }
                         _ => (),
                     };
@@ -188,26 +190,54 @@ pub(crate) fn status(dir: &Path) -> Res<status::Status> {
 }
 
 pub(crate) fn show(dir: &Path, reference: &str) -> Res<Diff> {
-    // TODO Use libigt2
     let repo = Repository::open(dir)?;
     let object = &repo.revparse_single(reference)?;
-    let tree = object.peel_to_tree()?;
-    let prev = tree.iter().skip(1).next().unwrap();
-
-    let diff = repo.diff_tree_to_tree(
-        Some(&prev.to_object(&repo)?.into_tree().unwrap()),
-        Some(&object.peel_to_tree()?),
-        None,
-    )?;
+
+    let commit = object.peel_to_commit()?;
+    let tree = commit.tree()?;
+    let parent_tree = commit.parent(0)?.tree()?;
+    let diff = repo.diff_tree_to_tree(Some(&parent_tree), Some(&tree), None)?;
     convert_diff(diff)
 }
 
-pub(crate) fn show_summary(dir: &Path, reference: &str) -> Res<String> {
+pub(crate) fn show_summary(dir: &Path, reference: &str) -> Res<Commit> {
     let repo = Repository::open(dir)?;
     let object = &repo.revparse_single(reference)?;
     let commit = object.peel_to_commit()?;
 
-    Ok(commit.message().unwrap_or("").to_string())
+    let author = commit.author();
+    let name = author.name().unwrap_or("");
+    let email = commit
+        .author()
+        .email()
+        .map(|email| format!("<{}>", email))
+        .unwrap_or("".to_string());
+
+    let message = commit
+        .message()
+        .unwrap_or("")
+        .to_string()
+        .lines()
+        .map(|line| format!("    {}", line))
+        .join("\n");
+
+    let offset = chrono::FixedOffset::east_opt(commit.time().offset_minutes() * 60).unwrap();
+    let time = chrono::DateTime::with_timezone(
+        &chrono::DateTime::from_timestamp(commit.time().seconds(), 0).unwrap(),
+        &offset,
+    );
+
+    let details = format!(
+        "Author: {}\nDate:   {}\n\n{}",
+        [name, &email].join(" "),
+        time.to_rfc2822(),
+        message
+    );
+
+    Ok(Commit {
+        hash: commit.id().to_string(),
+        details,
+    })
 }
 
 // TODO Make this return a more useful type. Vec<Log>?

src/items.rs

@@ -154,3 +154,12 @@ pub(crate) fn create_log_items(log: &str) -> impl Iterator<Item = Item> + '_ {
         }
     })
 }
+
+pub(crate) fn blank_line() -> Item {
+    Item {
+        display: Text::raw(""),
+        depth: 0,
+        unselectable: true,
+        ..Default::default()
+    }
+}

src/lib.rs

@@ -442,6 +442,29 @@ mod tests {
         insta::assert_snapshot!(redact_hashes(terminal, dir));
     }
 
+    #[test]
+    fn log() {
+        let (ref mut terminal, ref mut state, dir) = setup(60, 20);
+        commit(&dir, "firstfile", "testing\ntesttest\n");
+        commit(&dir, "secondfile", "testing\ntesttest\n");
+        update(terminal, state, &[key('g'), key('l'), key('l')]).unwrap();
+        insta::assert_snapshot!(redact_hashes(terminal, dir));
+    }
+
+    #[test]
+    fn show() {
+        let (ref mut terminal, ref mut state, dir) = setup(60, 20);
+        commit(&dir, "firstfile", "This should not be visible\n");
+        commit(&dir, "secondfile", "This should be visible\n");
+        update(
+            terminal,
+            state,
+            &[key('g'), key('l'), key('l'), key_code(KeyCode::Enter)],
+        )
+        .unwrap();
+        insta::assert_snapshot!(redact_hashes(terminal, dir));
+    }
+
     #[test]
     fn rebase_conflict() {
         let (ref mut terminal, ref mut state, dir) = setup(60, 20);
@@ -504,8 +527,8 @@ mod tests {
     fn commit(dir: &TempDir, file_name: &str, contents: &str) {
         let path = dir.child(file_name);
         let message = match path.try_exists() {
-            Ok(true) => format!("modify {}", file_name),
-            _ => format!("add {}", file_name),
+            Ok(true) => format!("modify {}\n\nCommit body goes here\n", file_name),
+            _ => format!("add {}\n\nCommit body goes here\n", file_name),
         };
         fs::write(path, contents).expect("error writing to file");
         run(dir, &["git", "add", file_name]);
@@ -516,6 +539,7 @@ mod tests {
         String::from_utf8(
             Command::new(cmd[0])
                 .args(&cmd[1..])
+                .env("GIT_COMMITTER_DATE", "Sun Feb 18 14:00 2024 +0100")
                 .current_dir(dir.path())
                 .output()
                 .unwrap_or_else(|_| panic!("failed to execute {:?}", cmd))
@@ -528,11 +552,20 @@ mod tests {
         Event::Key(KeyEvent::new(KeyCode::Char(char), KeyModifiers::empty()))
     }
 
+    fn key_code(code: KeyCode) -> Event {
+        Event::Key(KeyEvent::new(code, KeyModifiers::empty()))
+    }
+
     fn redact_hashes(terminal: &mut Terminal<TestBackend>, dir: TempDir) -> String {
         let mut debug_output = format!("{:#?}", terminal.backend().buffer());
+
+        for hash in run(&dir, &["git", "log", "--all", "--format=%H", "HEAD"]).lines() {
+            debug_output = debug_output.replace(hash, &"_".repeat(hash.len()));
+        }
         for hash in run(&dir, &["git", "log", "--all", "--format=%h", "HEAD"]).lines() {
-            debug_output = debug_output.replace(hash, "_______");
+            debug_output = debug_output.replace(hash, &"_".repeat(hash.len()));
         }
+
         debug_output
     }
 }

src/screen/show.rs

@@ -1,10 +1,14 @@
 use crate::{
     git,
     items::{self, Item},
-    util, Config, Res,
+    theme::CURRENT_THEME,
+    Config, Res,
+};
+use ratatui::{
+    prelude::Rect,
+    style::Stylize,
+    text::{Line, Text},
 };
-use ansi_to_tui::IntoText;
-use ratatui::{prelude::Rect, text::Text};
 
 use super::Screen;
 
@@ -14,18 +18,25 @@ pub(crate) fn create(config: &Config, size: Rect, reference: String) -> Res<Scre
     Screen::new(
         size,
         Box::new(move || {
-            let summary = git::show_summary(&config.dir, &reference)?;
+            let commit = git::show_summary(&config.dir, &reference)?;
             let show = git::show(&config.dir.clone(), &reference)?;
+            let mut details = Text::from(commit.details);
+            details.lines.push(Line::raw(""));
 
-            let commit_text = summary.replace("", "").into_text()?;
-
-            Ok([
+            Ok(vec![
                 Item {
-                    display: Text::from(commit_text.lines[0].clone()),
+                    id: format!("commit_section_{}", commit.hash).into(),
+                    display: Text::from(
+                        format!("commit {}", commit.hash).fg(CURRENT_THEME.section),
+                    ),
+                    section: true,
+                    depth: 0,
                     ..Default::default()
                 },
                 Item {
-                    display: Text::from(commit_text.lines[1..].to_vec()),
+                    id: format!("commit_{}", commit.hash).into(),
+                    display: details,
+                    depth: 1,
                     unselectable: true,
                     ..Default::default()
                 },