Merge branch 'feature/list-untracked'

github: Closes richih/vcsh#142

diff --combined doc/vcsh.1.ronn
index 4138c23d53c4fbcd73ee87e86dbff70ceec57cc9,f82a8776940167d6d13073906a7d743035c0f02c..9827d4ff243ad10b625b53dac53bb4ffb9132b72
--- 1/doc/vcsh.1.ronn
--- 2/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@@ -21,6 -21,8 +21,8 @@@ vcsh(1) - Version Control System for $H
  
  `vcsh` list-tracked-by <repo>
  
+ `vcsh` list-untracked [<-r>] [<repo>]
+ 
  `vcsh` pull
  
  `vcsh` push
@@@ -110,6 -112,16 +112,16 @@@ an interactive user
  * list-tracked-by:
    List files tracked by a repository.
  
+ * list-untracked:
+   List all files NOT tracked by vcsh.
+ 
+   By default, the file list is shallow and stops at directory levels where
+   possible. If you prefer to get a list of all files, append `-r` for
+   recursive mode.
+ 
+   If you want to list files not tracked by a specific repository, simply
+   append the repository's name last.
+ 
  * pull:
    Pull from all vcsh remotes.
  
@@@ -254,24 -266,6 +266,24 @@@ Available hooks are <pre-clone>, <post-
  If you need more, vcsh is trivial to patch, but please let upstream know so
  we can ship them by default.
  
 +## OVERLAY SYSTEM
 +
 +`vcsh` also provides an overlay system. Similar to hooks, the recommended
 +locations are <$XDG_CONFIG_HOME/vcsh/overlays-available> and
 +<$XDG_CONFIG_HOME/vcsh/overlays-enabled>.
 +
 +Overlays follow the same rules as hooks and you are free to overwrite any
 +and all functions. Same as hooks, you can use global or repository-specific
 +overlays by using either <$VCSH_OVERLAY_D/$VCSH_COMMAND> or
 +<$VCSH_OVERLAY_D/$VCSH_REPO_NAME.$VCSH_COMMAND>.
 +
 +Please note that nothing stops you from, e.g. overwriting `status()` in
 +<$VCSH_OVERLAY_D/commit>. As the overlays will be sourced and you are
 +replacing arbitrary functions, any and all features may stop working, or you
 +may even lose data.
 +
 +You have been warned.
 +
  ## DETAILED HOWTO AND FURTHER READING
  
  Manpages are often short and sometimes useless to glean best practices from.

diff --combined vcsh
index 53ce905c3a7c62abfbbfcb71e89c38b3b143bc1b,044bdf08a038ce103b4912169277078124e81fac..9480b485fe883e390dd9c18da25dda23525fc5b2
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -24,7 -24,6 +24,7 @@@ SELF=$(basename $0
  
  fatal() {
        echo "$SELF: fatal: $1" >&2
 +      [ -z $2] && exit 1
        exit $2
  }
  
@@@ -76,7 -75,6 +76,7 @@@ f
  # Read defaults
  : ${VCSH_REPO_D:="$XDG_CONFIG_HOME/vcsh/repo.d"}
  : ${VCSH_HOOK_D:="$XDG_CONFIG_HOME/vcsh/hooks-enabled"}
 +: ${VCSH_OVERLAY_D:="$XDG_CONFIG_HOME/vcsh/overlays-enabled"}
  : ${VCSH_BASE:="$HOME"}
  : ${VCSH_GITIGNORE:=exact}
  : ${VCSH_GITATTRIBUTES:=none}
@@@ -111,6 -109,8 +111,8 @@@ help() 
     list-tracked         List all files tracked by vcsh
     list-tracked-by \\
          <repo>          List files tracked by a repository
+    list-untracked \\
+         [<-r>] [<repo>] List all files not tracked by all or one repositories
     pull                 Pull from all vcsh remotes
     push                 Push to vcsh remotes
     rename <repo> \\
@@@ -150,10 -150,9 +152,10 @@@ clone() 
        git remote add origin "$GIT_REMOTE"
        git config branch.master.remote origin
        git config branch.master.merge  refs/heads/master
 -      if [ $(git ls-remote origin master 2> /dev/null | wc -l ) -lt 1 ]; then
 -              info "remote is empty, not merging anything"
 -              exit
 +      VCSH_CLONE_ERROR=$(git ls-remote origin master 2>&1)
 +      if [ -n "$VCSH_CLONE_ERROR" ]; then
 +              rm -rf "$GIT_DIR"
 +              fatal "$VCSH_CLONE_ERROR" 1
        fi
        git fetch
        hook pre-merge
@@@ -287,6 -286,55 +289,55 @@@ retire() 
        unset VCSH_DIRECTORY
  }
  
+ list_untracked() {
+       command -v 'comm' >/dev/null 2>&1 || fatal "Could not find 'comm'"
+ 
+       temp_file_others=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+       temp_file_untracked=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+       temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+ 
+       # Hack in support for `vcsh list-untracked -r`...
+       directory_opt="--directory"
+       shift 1
+       while getopts "r" flag; do
+               if [ x"$1" = x'-r' ]; then
+                       unset directory_opt
+               fi
+               shift 1
+       done
+       # ...and parse for a potential parameter afterwards. As we shifted things out of $* in during getops, we need to look at $1
+       VCSH_REPO_NAME=$1; export VCSH_REPO_NAME
+ 
+       if [ -n "$VCSH_REPO_NAME" ]; then
+               list_untracked_helper $VCSH_REPO_NAME
+       else
+               for VCSH_REPO_NAME in $(list); do
+                       list_untracked_helper $VCSH_REPO_NAME
+               done
+       fi
+       cat $temp_file_untracked
+ 
+       unset directory_opt directory_component
+       rm -f $temp_file_others $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not delete temp files'
+ }
+ 
+ list_untracked_helper() {
+       export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
+       git ls-files --others "$directory_opt" | (
+               while read line; do
+                       echo "$line"
+                       directory_component=${line%%/*}
+                       [ -d "$directory_component" ] && printf '%s/\n' "$directory_component"
+               done
+               ) | sort -u > $temp_file_others
+       if [ -z "$ran_once" ]; then
+               ran_once=1
+               cp $temp_file_others $temp_file_untracked || fatal 'Could not copy temp file'
+       fi
+       cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file'
+       comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
+ }
+ 
  rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
@@@ -354,7 -402,6 +405,7 @@@ use() 
  }
  
  which() {
 +      [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
        for VCSH_REPO_NAME in $(list); do
                for VCSH_FILE in $(get_files); do
                        echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"
@@@ -467,6 -514,7 +518,7 @@@ elif [ x"$VCSH_COMMAND" = x'delete' 
  elif [ x"$VCSH_COMMAND" = x'commit' ] ||
       [ x"$VCSH_COMMAND" = x'list'   ] ||
       [ x"$VCSH_COMMAND" = x'list-tracked' ] ||
+      [ x"$VCSH_COMMAND" = x'list-untracked' ] ||
       [ x"$VCSH_COMMAND" = x'pull'   ] ||
       [ x"$VCSH_COMMAND" = x'push'   ]; then
        :
@@@ -514,14 -562,6 +566,14 @@@ check_dir "$VCSH_REPO_D
  
  verbose "$VCSH_COMMAND begin"
  VCSH_COMMAND=$(echo "$VCSH_COMMAND" | sed 's/-/_/g'); export VCSH_COMMAND
 +
 +# source overlay functions
 +for overlay in "$VCSH_OVERLAY_D/$VCSH_COMMAND"* "$VCSH_OVERLAY_D/$VCSH_REPO_NAME.$VCSH_COMMAND"*; do
 +      [ -r "$overlay" ] || continue
 +      info "sourcing '$overlay'"
 +      . "$overlay"
 +done
 +
  hook pre-command
  $VCSH_COMMAND "$@"
  hook post-command