Merge branch 'feature/list-untracked'

github: Closes richih/vcsh#142

diff --git a/_vcsh b/_vcsh
index a33551bece27c8fe84f8ede4a94eedf0c2492d3d..53eaada4dae3764f4ff63bb88e5e68c80ae11393 100644 (file)
--- a/_vcsh
+++ b/_vcsh
@@ -43,6 +43,10 @@ function _vcsh-list-tracked-by () {
        (( CURRENT == 2 )) && __vcsh_repositories
 }
 
+function _vcsh-list-untracked () {
+       _nothing
+}
+
 function _vcsh-pull () {
        _nothing
 }
@@ -66,6 +70,10 @@ function _vcsh-run () {
        fi
 }
 
+function _vcsh-status () {
+       (( CURRENT == 2 )) && __vcsh_repositories
+}
+
 function _vcsh-upgrade () {
        (( CURRENT == 2 )) && __vcsh_repositories
 }
@@ -97,6 +105,7 @@ function _vcsh () {
                "list:list all local vcsh repositories"
                "list-tracked:list all files tracked by vcsh"
                "list-tracked-by:list files tracked by a repository"
+               "list-untracked:list all files not tracked by vcsh"
                "pull:pull from all vcsh remotes"
                "push:push to vcsh remotes"
                "rename:rename a repository"

diff --git a/doc/vcsh.1.ronn b/doc/vcsh.1.ronn
index 4138c23d53c4fbcd73ee87e86dbff70ceec57cc9..9827d4ff243ad10b625b53dac53bb4ffb9132b72 100644 (file)
--- a/doc/vcsh.1.ronn
+++ b/doc/vcsh.1.ronn
@@ -21,6 +21,8 @@ vcsh(1) - Version Control System for $HOME - multiple Git repositories in $HOME
 
 `vcsh` list-tracked-by <repo>
 
+`vcsh` list-untracked [<-r>] [<repo>]
+
 `vcsh` pull
 
 `vcsh` push
@@ -110,6 +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.
 

diff --git a/vcsh b/vcsh
index 53ce905c3a7c62abfbbfcb71e89c38b3b143bc1b..9480b485fe883e390dd9c18da25dda23525fc5b2 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -111,6 +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> \\
@@ -287,6 +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
@@ -467,6 +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
        :