Merge pull request #45 from supercrabtree/new-repomarkers

New repomarkers

Author: chrstphrknwtn

README.md

@@ -1,41 +1,28 @@
-![k](https://raw.githubusercontent.com/supercrabtree/k/master/k-logo.png)
+![k](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/k-logo.png)
 
 > k is the new l, yo
 
-## Directory listings for zsh with git features. 
-k is a zsh script to make directory listings more readable, adding a bit of color and some git information.
+## Directory listings for zsh with git features
 
-### Git status on entire repos
-Red for dirty, green for committed.
+**k** is a zsh script / plugin to make directory listings more readable, adding a bit of color and some git status information on files and directories.
 
-Turns this:  
-![repos-ls](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/repos-ls.jpg)
+### Git status on entire repos
+![status-ls](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/repo-dirs.jpg)
 
-Into this:  
-![repos-k](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/repos-k.jpg)
 
 ### Git status on files within a working tree
-Red for dirty, green for committed, orange for untracked, grey for ingored.
-
-Turns this:  
-![status-ls](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/status-ls.jpg)
-
-Into this:  
-![status-k](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/status-k.jpg)
+![status-ls](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/inside-work-tree.jpg)
 
 ### File weight colours
 Files sizes are graded from green for small (< 1k), to red for huge (> 1mb).
 
-Turns this:  
-![status-ls](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/size-ls.jpg)
+![status-ls](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/file-size-colors.jpg)
 
-Into this:  
-![status-k](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/size-k.jpg)
 
 ### Rotting dates
-
 Dates fade with age.  
-![repos-k](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/repos-k.jpg)
+
+![repos-k](https://raw.githubusercontent.com/supercrabtree/k/gh-pages/dates.jpg)
 
 
 ## Usage
@@ -51,8 +38,6 @@ hit k
 k
 ```
 
-profit
-
 ## Minimum Requirements
 zsh 4.3.11  
 Git 1.7.2

k-logo.png

@@ -61,6 +61,12 @@ k () {
     fi
   }
 
+  # Set if we're in a repo or not
+  typeset -i INSIDE_WORK_TREE=0
+  if [[ $(command git rev-parse --is-inside-work-tree 2>/dev/null) == true ]]; then
+    INSIDE_WORK_TREE=1
+  fi
+
   # Setup array of directories to print
   typeset -a base_dirs
 
@@ -380,23 +386,33 @@ k () {
       # --------------------------------------------------------------------------
       if [[ "$o_no_vcs" != "" ]]; then
         REPOMARKER=""
-      else
-        # Check for git repo
-        if (( IS_GIT_REPO != 0)); then
+      elif (( IS_GIT_REPO != 0)); then
+        # If we're not in a repo, still check each directory if it's a repo, and
+        # then mark appropriately
+        if (( INSIDE_WORK_TREE == 0 )); then
           if (( IS_DIRECTORY )); then
             if command git --git-dir="$GIT_TOPLEVEL/.git" --work-tree="${NAME}" diff --quiet --ignore-submodules HEAD &>/dev/null # if dirty
-              then REPOMARKER=$'\e[38;5;46m|\e[0m' # Show a green vertical bar for dirty
-              else REPOMARKER=$'\e[0;31m|\e[0m' # Show a red vertical bar if clean
+              then REPOMARKER=$'\e[38;5;46m|\e[0m' # Show a green vertical bar for clean
+              else REPOMARKER=$'\e[0;31m+\e[0m' # Show a red vertical bar if dirty
             fi
-          else
-            STATUS=$(git --git-dir=$GIT_TOPLEVEL/.git --work-tree=$GIT_TOPLEVEL status --porcelain --ignored --untracked-files=normal ${${${NAME:a}##$GIT_TOPLEVEL}#*/})
-            STATUS=${STATUS[1,2]}
-              if [[ $STATUS == ' M' ]]; then REPOMARKER=$'\e[0;31m|\e[0m';     # Modified
-            elif [[ $STATUS == '??' ]]; then REPOMARKER=$'\e[38;5;214m|\e[0m'; # Untracked
-            elif [[ $STATUS == '!!' ]]; then REPOMARKER=$'\e[38;5;238m|\e[0m'; # Ignored
-            elif [[ $STATUS == 'A ' ]]; then REPOMARKER=$'\e[38;5;093m|\e[0m'; # Added
-            else                             REPOMARKER=$'\e[38;5;082m|\e[0m'; # Good
+          fi
+        else
+          if (( IS_DIRECTORY )); then
+            # If the directory is ignored, skip it
+            if command git check-ignore --quiet ${NAME} 2>/dev/null
+              then STATUS='!!'
+              else STATUS=$(git --git-dir=$GIT_TOPLEVEL/.git --work-tree=$GIT_TOPLEVEL status --porcelain --untracked-files=normal ${${${NAME:a}##$GIT_TOPLEVEL}#*/})
             fi
+          else
+            STATUS=$(git status --porcelain --ignored --untracked-files=normal $NAME)
+          fi
+          STATUS=${STATUS[1,2]}
+            if [[ $STATUS == ' M' ]]; then REPOMARKER=$'\e[0;31m+\e[0m';     # Tracked & Dirty
+          elif [[ $STATUS == 'M ' ]]; then REPOMARKER=$'\e[38;5;082m+\e[0m'; # Tracked & Dirty & Added
+          elif [[ $STATUS == '??' ]]; then REPOMARKER=$'\e[38;5;214m+\e[0m'; # Untracked
+          elif [[ $STATUS == '!!' ]]; then REPOMARKER=$'\e[38;5;238m|\e[0m'; # Ignored
+          elif [[ $STATUS == 'A ' ]]; then REPOMARKER=$'\e[38;5;082m+\e[0m'; # Added
+          else                             REPOMARKER=$'\e[38;5;082m|\e[0m'; # Good
           fi
         fi
       fi