Merge branch 'feature/status_against_remote_tracking'

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 54026cf0ac4f67383ec86e5ff831d70b3f0a5222..246a7da993d5b33a55c73b83ebca193c8bb7d0d5 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -108,9 +108,8 @@ help() {
    help                 Display this help text
    init <repo>          Initialize a new repository
    list                 List all repositories
-   list-tracked         List all files tracked by vcsh
-   list-tracked-by \\
-        <repo>          List files tracked by a repository
+   list-tracked \\
+        [<repo>]        List all files tracked all or one repositories
    list-untracked \\
         [<-r>] [<repo>] List all files not tracked by all or one repositories
    pull                 Pull from all vcsh remotes
@@ -247,46 +246,22 @@ get_files() {
 }
 
 list_tracked() {
-       for VCSH_REPO_NAME in $(list); do
-               get_files
-       done | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
-           sed 's/[,\&]/\\&/g')," | sort -u
-}
-
-list_tracked_by() {
-       use
-       git ls-files | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
-           sed 's/[,\&]/\\&/g')," | sort -u
-}
-
-pull() {
-       hook pre-pull
-       for VCSH_REPO_NAME in $(list); do
-               printf '%s: ' "$VCSH_REPO_NAME"
-               GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
-               use
-               git pull
-               VCSH_COMMAND_RETURN_CODE=$?
-               echo
-       done
-       hook post-pull
+       VCSH_REPO_NAME=$2; export VCSH_REPO_NAME
+       if [ -n "$VCSH_REPO_NAME" ]; then
+               get_files | list_tracked_helper
+       else
+               for VCSH_REPO_NAME in $(list); do
+                       get_files
+               done | list_tracked_helper
+       fi
 }
 
-push() {
-       hook pre-push
-       for VCSH_REPO_NAME in $(list); do
-               printf '%s: ' "$VCSH_REPO_NAME"
-               GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
-               use
-               git push
-               VCSH_COMMAND_RETURN_CODE=$?
-               echo
-       done
-       hook post-push
+list_tracked_helper() {
+       sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | sed 's/[,\&]/\\&/g')," | sort -u
 }
 
-retire() {
-       unset VCSH_DIRECTORY
+list_tracked_by() {
+       list_tracked $2
 }
 
 list_untracked() {
@@ -338,6 +313,36 @@ list_untracked_helper() {
        comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
 }
 
+pull() {
+       hook pre-pull
+       for VCSH_REPO_NAME in $(list); do
+               printf '%s: ' "$VCSH_REPO_NAME"
+               GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
+               use
+               git pull
+               VCSH_COMMAND_RETURN_CODE=$?
+               echo
+       done
+       hook post-pull
+}
+
+push() {
+       hook pre-push
+       for VCSH_REPO_NAME in $(list); do
+               printf '%s: ' "$VCSH_REPO_NAME"
+               GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
+               use
+               git push
+               VCSH_COMMAND_RETURN_CODE=$?
+               echo
+       done
+       hook post-push
+}
+
+retire() {
+       unset VCSH_DIRECTORY
+}
+
 rename() {
        git_dir_exists
        [ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
@@ -374,6 +379,12 @@ status() {
 status_helper() {
        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
        use
+       remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && {
+               commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l)
+               commits_ahead=$(git log ${remote_tracking_branch}.. --oneline | wc -l)
+               [ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits"
+               [ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits"
+       }
        git status --short --untracked-files='no'
        VCSH_COMMAND_RETURN_CODE=$?
 }