Merge branch 'feature/repository_specific_configuration'

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 58ecb7f3ea7415fa4f94c0351985fe11af016161..4464c85cc6817b53e73cd762439e89029661c95b 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -379,6 +379,12 @@ status() {
 status_helper() {
        GIT_DIR=$VCSH_REPO_D/$VCSH_REPO_NAME.git; export GIT_DIR
        use
 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=$?
 }
        git status --short --untracked-files='no'
        VCSH_COMMAND_RETURN_CODE=$?
 }


@@ -573,6 +579,9 @@ check_dir "$VCSH_REPO_D"
 verbose "$VCSH_COMMAND begin"
 VCSH_COMMAND=$(echo "$VCSH_COMMAND" | sed 's/-/_/g'); export VCSH_COMMAND
 
 verbose "$VCSH_COMMAND begin"
 VCSH_COMMAND=$(echo "$VCSH_COMMAND" | sed 's/-/_/g'); export VCSH_COMMAND
 

+# Source repo-specific configuration file
+[ -r "$XDG_CONFIG_HOME/vcsh/config.d/$VCSH_REPO_NAME" ] && . "$XDG_CONFIG_HOME/vcsh/config.d/$VCSH_REPO_NAME"
+

 # source overlay functions
 for overlay in "$VCSH_OVERLAY_D/$VCSH_COMMAND"* "$VCSH_OVERLAY_D/$VCSH_REPO_NAME.$VCSH_COMMAND"*; do
        [ -r "$overlay" ] || continue
 # source overlay functions
 for overlay in "$VCSH_OVERLAY_D/$VCSH_COMMAND"* "$VCSH_OVERLAY_D/$VCSH_REPO_NAME.$VCSH_COMMAND"*; do
        [ -r "$overlay" ] || continue