X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=admin%2Fprog%2Fbash_prompt;h=4e428f398450283bf5d72833cab7e453e776e420;hb=a429d549424241eec8d686150b92eb7f047b7f10;hp=f3575b397e4d6806f7e96f89d64dc03358dd4257;hpb=9ebba9512de5b78c69bd6d134e5669ce3f17ec34;p=dotfiles.git

diff --git a/admin/prog/bash_prompt b/admin/prog/bash_prompt
index f3575b3..4e428f3 100644
--- a/admin/prog/bash_prompt
+++ b/admin/prog/bash_prompt
@@ -40,19 +40,14 @@ prompt_git() {
             # ensure index is up to date
             #git update-index --really-refresh -q &>/dev/null
 
-            # check for uncommitted changes in the index
-            if ! $(git diff --quiet --ignore-submodules --cached); then
-                s="$s+";
-            fi
-
             # check for unstaged changes
             if [ -n "$(git ls-files --modified)" ]; then
                 s="$s*";
             fi
 
-            # check for untracked files
-            if [ -n "$(git ls-files --others --exclude-standard)" ]; then
-                s="$s%";
+            # check for uncommitted changes in the index
+            if ! $(git diff --quiet --ignore-submodules --cached); then
+                s="$s+";
             fi
 
             # check for stashed files
@@ -60,6 +55,11 @@ prompt_git() {
                 s="$s$";
             fi
 
+            # check for untracked files
+            if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+                s="$s%";
+            fi
+
         fi
 
         # get the short symbolic ref
@@ -69,23 +69,39 @@ prompt_git() {
                       git rev-parse --short HEAD 2> /dev/null || \
                       printf "(unknown)")"
 
-        [ -n "$s" ] && s=" [$s]"
+        up=`git rev-parse --abbrev-ref @{u} 2>/dev/null`
+        if [ -n "$up" ]; then
+            local left right
+            set -- `git rev-list --count --left-right @{u}...@`
+            left=$1
+            right=$2
+            if [ "$left" -gt 0 -o "$right" -gt 0 ]; then
+                if [ "$left" -gt 0 ]; then
+                    s="$s-$left"
+                fi
+                if [ "$right" -gt 0 ]; then
+                    s="$s+$right"
+                fi
+            fi
+        fi
+
+        [ -n "$s" ] && s=" $s"
         printf " (%s)" "$branchName$s"
     fi
 }
 
-if test -x /usr/bin/git >/dev/null 2>&1; then
-   if [ "`type -t __git_ps1`" != function ]; then
-      git_sh_prompt=`git --exec-path`/git-sh-prompt
-      test -r $git_sh_prompt && . $git_sh_prompt || :
-   fi
-   if [ "`type -t __git_ps1`" = function ]; then
-      GIT_PS1_SHOWDIRTYSTATE=true
-      GIT_PS1_SHOWSTASHSTATE=true
-      GIT_PS1_SHOWUNTRACKEDFILES=true
-      GIT_PS1_SHOWUPSTREAM=verbose
-   fi
-fi
+#if test -x /usr/bin/git >/dev/null 2>&1; then
+#   if [ "`type -t __git_ps1`" != function ]; then
+#      git_sh_prompt=`git --exec-path`/git-sh-prompt
+#      test -r $git_sh_prompt && . $git_sh_prompt || :
+#   fi
+#   if [ "`type -t __git_ps1`" = function ]; then
+#      GIT_PS1_SHOWDIRTYSTATE=true
+#      GIT_PS1_SHOWSTASHSTATE=true
+#      GIT_PS1_SHOWUNTRACKEDFILES=true
+#      GIT_PS1_SHOWUPSTREAM=verbose
+#   fi
+#fi
 
 set_prompts() {
       OPS1=''
@@ -110,12 +126,14 @@ set_prompts() {
    OPS1+="${debian_chroot:+($debian_chroot)}"
    OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
    if test -x /usr/bin/git >/dev/null 2>&1; then
-      if [ "`type -t __git_ps1`" = function ]; then
-         OPS1+="\$(__git_ps1)"
-      else
+      #if [ "`type -t __git_ps1`" = function ]; then
+      #   OPS1+="\$(__git_ps1)"
+      #else
          OPS1+="\$(prompt_git)"
-      fi
+      #fi
    fi
-   OPS1+=" \\$\$SHLVL "
+   # This is for .screenrc: shelltitle "\$ |$SHELL"
+   #OPS1+="\[\033k\033\\\\\]"
+   OPS1+=" \$SHLVL\\$ "
    export OPS1
 }