Merge branch 'master' into #3-stashing

# Conflicts:
#	src/app.rs

Author: Stephan Dilly

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- log tab refreshes when head changes ([#78](https://github.com/extrawurst/gitui/issues/78))
+
 ## [0.3.0] - 2020-05-20
 
 ### Added

asyncgit/src/revlog.rs

@@ -1,6 +1,11 @@
-use crate::{error::Result, sync, AsyncNotification, CWD};
+use crate::{
+    error::Result,
+    sync::{utils::repo, LogWalker},
+    AsyncNotification, CWD,
+};
 use crossbeam_channel::Sender;
 use git2::Oid;
+use log::debug;
 use scopetime::scope_time;
 use std::{
     iter::FromIterator,
@@ -9,7 +14,6 @@ use std::{
         Arc, Mutex,
     },
 };
-use sync::{utils::repo, LogWalker};
 
 ///
 pub struct AsyncLog {
@@ -54,9 +58,29 @@ impl AsyncLog {
         self.pending.load(Ordering::Relaxed)
     }
 
+    ///
+    fn current_head(&self) -> Result<Oid> {
+        Ok(self.current.lock()?.first().map_or(Oid::zero(), |f| *f))
+    }
+
+    ///
+    fn head_changed(&self) -> Result<bool> {
+        if let Ok(head) = repo(CWD)?.head() {
+            if let Some(head) = head.target() {
+                debug!(
+                    "repo head vs current log head: {} vs. {}",
+                    head,
+                    self.current_head()?
+                );
+                return Ok(head != self.current_head()?);
+            }
+        }
+        Ok(false)
+    }
+
     ///
     pub fn fetch(&mut self) -> Result<()> {
-        if !self.is_pending() {
+        if !self.is_pending() && self.head_changed()? {
             self.clear()?;
 
             let arc_current = Arc::clone(&self.current);
@@ -65,6 +89,7 @@ impl AsyncLog {
 
             rayon_core::spawn(move || {
                 scope_time!("async::revlog");
+
                 arc_pending.store(true, Ordering::Relaxed);
                 AsyncLog::fetch_helper(arc_current, &sender)
                     .expect("failed to fetch");

src/app.rs

@@ -141,10 +141,11 @@ impl App {
     }
 
     //TODO: do we need this?
-    ///
+    /// forward ticking to components that require it
     pub fn update(&mut self) {
         trace!("update");
         self.status_tab.update();
+        self.revlog.update();
         self.stashing_tab.update();
     }
 

src/components/help.rs

@@ -27,19 +27,13 @@ pub struct HelpComponent {
 impl DrawableComponent for HelpComponent {
     fn draw<B: Backend>(&mut self, f: &mut Frame<B>, _rect: Rect) {
         if self.visible {
-            let (txt, selected_line) = self.get_text();
-
-            let height = 24;
-            let scroll_threshold = height / 3;
-
-            let scroll = if selected_line > scroll_threshold {
-                self.selection - scroll_threshold
-            } else {
-                0
-            };
+            const SIZE: (u16, u16) = (65, 24);
+            let scroll_threshold = SIZE.1 / 3;
+            let scroll =
+                self.selection.saturating_sub(scroll_threshold);
 
             let area =
-                ui::centered_rect_absolute(65, height, f.size());
+                ui::centered_rect_absolute(SIZE.0, SIZE.1, f.size());
 
             f.render_widget(Clear, area);
             f.render_widget(
@@ -60,7 +54,7 @@ impl DrawableComponent for HelpComponent {
                 .split(area);
 
             f.render_widget(
-                Paragraph::new(txt.iter())
+                Paragraph::new(self.get_text().iter())
                     .scroll(scroll)
                     .alignment(Alignment::Left),
                 chunks[0],
@@ -182,16 +176,17 @@ impl HelpComponent {
         };
         new_selection = cmp::max(new_selection, 0);
 
-        if let Ok(max) = u16::try_from(self.cmds.len() - 1) {
+        if let Ok(max) =
+            u16::try_from(self.cmds.len().saturating_sub(1))
+        {
             self.selection = cmp::min(new_selection, max);
         }
     }
 
-    fn get_text<'a>(&self) -> (Vec<Text<'a>>, u16) {
+    fn get_text<'a>(&self) -> Vec<Text<'a>> {
         let mut txt = Vec::new();
 
         let mut processed = 0_u16;
-        let mut selected_line = 0_u16;
 
         for (key, group) in
             &self.cmds.iter().group_by(|e| e.text.group)
@@ -206,9 +201,7 @@ impl HelpComponent {
                     .sorted_by_key(|e| e.order)
                     .map(|e| {
                         let is_selected = self.selection == processed;
-                        if is_selected {
-                            selected_line = processed;
-                        }
+
                         processed += 1;
 
                         let mut out = String::from(if is_selected {
@@ -236,6 +229,6 @@ impl HelpComponent {
             );
         }
 
-        (txt, selected_line)
+        txt
     }
 }

src/main.rs

@@ -54,11 +54,9 @@ fn main() -> Result<()> {
         return Ok(());
     }
 
-    enable_raw_mode()?;
-    io::stdout().execute(EnterAlternateScreen)?;
+    setup_terminal()?;
     defer! {
-        io::stdout().execute(LeaveAlternateScreen).unwrap();
-        disable_raw_mode().unwrap();
+        shutdown_terminal().expect("shutdown failed");
     }
 
     set_panic_handlers();
@@ -118,6 +116,18 @@ fn main() -> Result<()> {
     Ok(())
 }
 
+fn setup_terminal() -> Result<()> {
+    enable_raw_mode()?;
+    io::stdout().execute(EnterAlternateScreen)?;
+    Ok(())
+}
+
+fn shutdown_terminal() -> Result<()> {
+    io::stdout().execute(LeaveAlternateScreen)?;
+    disable_raw_mode()?;
+    Ok(())
+}
+
 fn draw<B: Backend>(
     terminal: &mut Terminal<B>,
     app: &mut App,
@@ -202,6 +212,8 @@ fn set_panic_handlers() {
     panic::set_hook(Box::new(|e| {
         let backtrace = Backtrace::new();
         error!("panic: {:?}\ntrace:\n{:?}", e, backtrace);
+        shutdown_terminal().expect("shutdown failed inside panic");
+        eprintln!("panic: {:?}\ntrace:\n{:?}", e, backtrace);
     }));
 
     // global threadpool

src/tabs/revlog/mod.rs

@@ -72,9 +72,15 @@ impl Revlog {
 
     ///
     pub fn update(&mut self) {
+        if self.visible {
+            self.git_log.fetch().unwrap();
+        }
+
+        let old_total = self.count_total;
         self.count_total = self.git_log.count().unwrap();
 
         if self.items.needs_data(self.selection, self.selection_max())
+            || old_total != self.count_total
         {
             self.fetch_commits();
         }