full commit detail popup (#113)

see #80

Author: Stephan Dilly

asyncgit/src/sync/commit_files.rs

@@ -1,6 +1,6 @@
 use super::{utils::repo, CommitId};
 use crate::{error::Result, StatusItem, StatusItemType};
-use git2::DiffDelta;
+use git2::{Diff, DiffDelta, DiffOptions, Repository};
 use scopetime::scope_time;
 
 /// get all files that are part of a commit
@@ -12,19 +12,7 @@ pub fn get_commit_files(
 
     let repo = repo(repo_path)?;
 
-    let commit = repo.find_commit(id.into())?;
-    let commit_tree = commit.tree()?;
-    let parent = if commit.parent_count() > 0 {
-        Some(repo.find_commit(commit.parent_id(0)?)?.tree()?)
-    } else {
-        None
-    };
-
-    let diff = repo.diff_tree_to_tree(
-        parent.as_ref(),
-        Some(&commit_tree),
-        None,
-    )?;
+    let diff = get_commit_diff(&repo, id, None)?;
 
     let mut res = Vec::new();
 
@@ -48,6 +36,37 @@ pub fn get_commit_files(
     Ok(res)
 }
 
+///
+pub(crate) fn get_commit_diff(
+    repo: &Repository,
+    id: CommitId,
+    pathspec: Option<String>,
+) -> Result<Diff<'_>> {
+    // scope_time!("get_commit_diff");
+
+    let commit = repo.find_commit(id.into())?;
+    let commit_tree = commit.tree()?;
+    let parent = if commit.parent_count() > 0 {
+        Some(repo.find_commit(commit.parent_id(0)?)?.tree()?)
+    } else {
+        None
+    };
+
+    let mut opt = pathspec.map(|p| {
+        let mut opts = DiffOptions::new();
+        opts.pathspec(p);
+        opts
+    });
+
+    let diff = repo.diff_tree_to_tree(
+        parent.as_ref(),
+        Some(&commit_tree),
+        opt.as_mut(),
+    )?;
+
+    Ok(diff)
+}
+
 #[cfg(test)]
 mod tests {
     use super::get_commit_files;

asyncgit/src/sync/diff.rs

@@ -1,6 +1,6 @@
 //! sync git api for fetching a diff
 
-use super::utils;
+use super::{commit_files::get_commit_diff, utils, CommitId};
 use crate::{error::Error, error::Result, hash};
 use git2::{
     Delta, Diff, DiffDelta, DiffFormat, DiffHunk, DiffOptions, Patch,
@@ -81,6 +81,8 @@ pub(crate) fn get_diff_raw<'a>(
     stage: bool,
     reverse: bool,
 ) -> Result<Diff<'a>> {
+    // scope_time!("get_diff_raw");
+
     let mut opt = DiffOptions::new();
     opt.pathspec(p);
     opt.reverse(reverse);
@@ -119,7 +121,7 @@ pub(crate) fn get_diff_raw<'a>(
     Ok(diff)
 }
 
-///
+/// returns diff of a specific file either in `stage` or workdir
 pub fn get_diff(
     repo_path: &str,
     p: String,
@@ -131,6 +133,32 @@ pub fn get_diff(
     let work_dir = work_dir(&repo);
     let diff = get_diff_raw(&repo, &p, stage, false)?;
 
+    raw_diff_to_file_diff(&diff, work_dir)
+}
+
+/// returns diff of a specific file inside a commit
+/// see `get_commit_diff`
+pub fn get_diff_commit(
+    repo_path: &str,
+    id: CommitId,
+    p: String,
+) -> Result<FileDiff> {
+    scope_time!("get_diff_commit");
+
+    let repo = utils::repo(repo_path)?;
+    let work_dir = work_dir(&repo);
+    let diff = get_commit_diff(&repo, id, Some(p))?;
+
+    raw_diff_to_file_diff(&diff, work_dir)
+}
+
+///
+fn raw_diff_to_file_diff<'a>(
+    diff: &'a Diff,
+    work_dir: &Path,
+) -> Result<FileDiff> {
+    // scope_time!("raw_diff_to_file_diff");
+
     let mut res: FileDiff = FileDiff::default();
     let mut current_lines = Vec::new();
     let mut current_hunk: Option<HunkHeader> = None;

asyncgit/src/sync/mod.rs

@@ -17,6 +17,7 @@ pub mod utils;
 pub use commit_details::{get_commit_details, CommitDetails};
 pub use commit_files::get_commit_files;
 pub use commits_info::{get_commits_info, CommitId, CommitInfo};
+pub use diff::get_diff_commit;
 pub use hooks::{hooks_commit_msg, hooks_post_commit, HookResult};
 pub use hunks::{stage_hunk, unstage_hunk};
 pub use ignore::add_to_ignore;

src/app.rs

@@ -3,8 +3,9 @@ use crate::{
     cmdbar::CommandBar,
     components::{
         event_pump, CommandBlocking, CommandInfo, CommitComponent,
-        Component, DrawableComponent, HelpComponent, MsgComponent,
-        ResetComponent, StashMsgComponent,
+        Component, DrawableComponent, HelpComponent,
+        InspectCommitComponent, MsgComponent, ResetComponent,
+        StashMsgComponent,
     },
     keys,
     queue::{Action, InternalEvent, NeedsUpdate, Queue},
@@ -33,6 +34,7 @@ pub struct App {
     reset: ResetComponent,
     commit: CommitComponent,
     stashmsg_popup: StashMsgComponent,
+    inspect_commit_popup: InspectCommitComponent,
     cmdbar: CommandBar,
     tab: usize,
     revlog: Revlog,
@@ -58,12 +60,15 @@ impl App {
                 queue.clone(),
                 &theme,
             ),
+            inspect_commit_popup: InspectCommitComponent::new(
+                &queue, sender, &theme,
+            ),
             do_quit: false,
             cmdbar: CommandBar::new(&theme),
             help: HelpComponent::new(&theme),
             msg: MsgComponent::new(&theme),
             tab: 0,
-            revlog: Revlog::new(sender, &theme),
+            revlog: Revlog::new(&queue, sender, &theme),
             status_tab: Status::new(sender, &queue, &theme),
             stashing_tab: Stashing::new(sender, &queue, &theme),
             stashlist_tab: StashList::new(&queue, &theme),
@@ -159,8 +164,11 @@ impl App {
         if flags.contains(NeedsUpdate::ALL) {
             self.update()?;
         }
+        //TODO: make this a queue event?
+        //NOTE: set when any tree component changed selection
         if flags.contains(NeedsUpdate::DIFF) {
             self.status_tab.update_diff()?;
+            self.inspect_commit_popup.update_diff()?;
         }
         if flags.contains(NeedsUpdate::COMMANDS) {
             self.update_commands();
@@ -191,6 +199,7 @@ impl App {
         self.status_tab.update_git(ev)?;
         self.stashing_tab.update_git(ev)?;
         self.revlog.update_git(ev)?;
+        self.inspect_commit_popup.update_git(ev)?;
 
         if let AsyncNotification::Status = ev {
             //TODO: is that needed?
@@ -210,6 +219,7 @@ impl App {
         self.status_tab.anything_pending()
             || self.revlog.any_work_pending()
             || self.stashing_tab.anything_pending()
+            || self.inspect_commit_popup.any_work_pending()
     }
 }
 
@@ -222,6 +232,7 @@ impl App {
             reset,
             commit,
             stashmsg_popup,
+            inspect_commit_popup,
             help,
             revlog,
             status_tab,
@@ -356,6 +367,10 @@ impl App {
                 self.stashmsg_popup.show()?
             }
             InternalEvent::TabSwitch => self.set_tab(0)?,
+            InternalEvent::InspectCommit(id) => {
+                self.inspect_commit_popup.open(id)?;
+                flags.insert(NeedsUpdate::ALL | NeedsUpdate::COMMANDS)
+            }
         };
 
         Ok(flags)
@@ -407,19 +422,31 @@ impl App {
             || self.help.is_visible()
             || self.reset.is_visible()
             || self.msg.is_visible()
+            || self.stashmsg_popup.is_visible()
+            || self.inspect_commit_popup.is_visible()
     }
 
     fn draw_popups<B: Backend>(
         &mut self,
         f: &mut Frame<B>,
     ) -> Result<()> {
-        let size = f.size();
+        let size = Layout::default()
+            .direction(Direction::Vertical)
+            .constraints(
+                [
+                    Constraint::Min(1),
+                    Constraint::Length(self.cmdbar.height()),
+                ]
+                .as_ref(),
+            )
+            .split(f.size())[0];
 
         self.commit.draw(f, size)?;
         self.stashmsg_popup.draw(f, size)?;
         self.reset.draw(f, size)?;
         self.help.draw(f, size)?;
         self.msg.draw(f, size)?;
+        self.inspect_commit_popup.draw(f, size)?;
 
         Ok(())
     }

src/components/changes.rs

@@ -53,7 +53,7 @@ impl ChangesComponent {
             files: FileTreeComponent::new(
                 title,
                 focus,
-                queue.clone(),
+                Some(queue.clone()),
                 theme,
             ),
             is_working_dir,
@@ -75,7 +75,8 @@ impl ChangesComponent {
 
     ///
     pub fn focus_select(&mut self, focus: bool) {
-        self.files.focus_select(focus)
+        self.files.focus(focus);
+        self.files.show_selection(focus);
     }
 
     /// returns true if list is empty