Tree view

.gitignore

@@ -1,2 +1,3 @@
 /target
+/release
 .DS_Store

Cargo.toml

@@ -6,6 +6,7 @@ description = "blazing fast terminal-ui for git"
 edition = "2018"
 exclude = [".github/*",".vscode/*"]
 homepage = "https://github.com/extrawurst/gitui"
+repository = "https://github.com/extrawurst/gitui"
 readme = "README.md"
 license = "MIT"
 categories = ["command-line-utilities"]
@@ -28,6 +29,7 @@ dirs = "2.0"
 crossbeam-channel = "0.4"
 scopeguard = "1.1"
 bitflags = "1.2"
+maplit = "1.0"
 backtrace = { version = "0.3" }
 scopetime = { path = "./scopetime", version = "0.1" }
 asyncgit = { path = "./asyncgit", version = "0.1" }

asyncgit/Cargo.toml

@@ -4,7 +4,8 @@ version = "0.1.8"
 authors = ["Stephan Dilly <dilly.stephan@gmail.com>"]
 edition = "2018"
 description = "allow using git2 in a asynchronous context"
-homepage = "https://gitui.org"
+homepage = "https://github.com/extrawurst/gitui"
+repository = "https://github.com/extrawurst/gitui"
 readme = "README.md"
 license = "MIT"
 categories = ["concurrency","asynchronous"]

asyncgit/src/sync/status.rs

@@ -5,7 +5,7 @@ use git2::{Status, StatusOptions, StatusShow};
 use scopetime::scope_time;
 
 ///
-#[derive(Copy, Clone, Hash)]
+#[derive(Copy, Clone, Hash, PartialEq, Debug)]
 pub enum StatusItemType {
     ///
     New,
@@ -36,7 +36,7 @@ impl From<Status> for StatusItemType {
 }
 
 ///
-#[derive(Default, Clone, Hash)]
+#[derive(Default, Clone, Hash, PartialEq, Debug)]
 pub struct StatusItem {
     ///
     pub path: String,

scopetime/Cargo.toml

@@ -4,7 +4,8 @@ version = "0.1.1"
 authors = ["Stephan Dilly <dilly.stephan@gmail.com>"]
 edition = "2018"
 description = "log runtime of arbitrary scope"
-homepage = "https://gitui.org"
+homepage = "https://github.com/extrawurst/gitui"
+repository = "https://github.com/extrawurst/gitui"
 license = "MIT"
 readme = "README.md"
 categories = ["development-tools::profiling"]

src/app.rs

@@ -2,7 +2,8 @@ use crate::{
     components::{
         ChangesComponent, CommandBlocking, CommandInfo,
         CommitComponent, Component, DiffComponent, DrawableComponent,
-        HelpComponent, MsgComponent, ResetComponent,
+        FileTreeItemKind, HelpComponent, MsgComponent,
+        ResetComponent,
     },
     keys,
     queue::{InternalEvent, NeedsUpdate, Queue},
@@ -177,7 +178,9 @@ impl App {
                     self.switch_focus(Focus::WorkDir)
                 }
                 keys::FOCUS_STAGE => self.switch_focus(Focus::Stage),
-                keys::FOCUS_RIGHT => self.switch_focus(Focus::Diff),
+                keys::FOCUS_RIGHT if self.can_focus_diff() => {
+                    self.switch_focus(Focus::Diff)
+                }
                 keys::FOCUS_LEFT => {
                     self.switch_focus(match self.diff_target {
                         DiffTarget::Stage => Focus::Stage,
@@ -225,6 +228,14 @@ impl App {
     pub fn is_quit(&self) -> bool {
         self.do_quit
     }
+
+    fn can_focus_diff(&self) -> bool {
+        match self.focus {
+            Focus::WorkDir => self.index_wd.is_file_seleted(),
+            Focus::Stage => self.index.is_file_seleted(),
+            _ => false,
+        }
+    }
 }
 
 // private impls
@@ -259,11 +270,12 @@ impl App {
             DiffTarget::WorkingDir => (&self.index_wd, false),
         };
 
-        if let Some(i) = idx.selection() {
-            Some((i.path, is_stage))
-        } else {
-            None
+        if let Some(item) = idx.selection() {
+            if let FileTreeItemKind::File(i) = item.kind {
+                return Some((i.path, is_stage));
+            }
         }
+        None
     }
 
     fn update_commands(&mut self) {
@@ -381,7 +393,7 @@ impl App {
                 ));
                 res.push(CommandInfo::new(
                     commands::STATUS_FOCUS_RIGHT,
-                    true,
+                    self.can_focus_diff(),
                     main_cmds_available && !focus_on_diff,
                 ));
             }