git-prompt.sh: refactor colored prompt code

__git_ps1_colorize_gitstring() sets color codes and
builds the prompt gitstring. It has duplicated code
to handle color codes for bash and zsh shells.
__git_ps1() also has duplicated logic to build the
prompt gitstring.

Remove duplication of logic to build gitstring in
__git_ps1_colorize_gitstring() and __git_ps1().

Leave in __git_ps1_colorize_gitstring() only logic
to set color codes.

Signed-off-by: Eduardo R. D'Avila <erdavila@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 07a6218d10679f5102c3649794bfd98e1883da75..fdedb45cd6f3bbeb83dbb4e993ed42cb0eb3353e 100644 (file)
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -225,8 +225,8 @@ __git_ps1_show_upstream ()
 }
 
 # Helper function that is meant to be called from __git_ps1.  It
 }
 
 # Helper function that is meant to be called from __git_ps1.  It

-# builds up a gitstring injecting color codes into the appropriate
-# places.
+# injects color codes into the appropriate gitstring variables used
+# to build a gitstring.

 __git_ps1_colorize_gitstring ()
 {
        if [[ -n ${ZSH_VERSION-} ]]; then
 __git_ps1_colorize_gitstring ()
 {
        if [[ -n ${ZSH_VERSION-} ]]; then


@@ -234,74 +234,40 @@ __git_ps1_colorize_gitstring ()
                local c_green='%F{green}'
                local c_lblue='%F{blue}'
                local c_clear='%f'
                local c_green='%F{green}'
                local c_lblue='%F{blue}'
                local c_clear='%f'

-               local bad_color=$c_red
-               local ok_color=$c_green
-               local branch_color="$c_clear"
-               local flags_color="$c_lblue"
-               local branchstring="$c${b##refs/heads/}"
-
-               if [ $detached = no ]; then
-                       branch_color="$ok_color"
-               else
-                       branch_color="$bad_color"
-               fi
-
-               gitstring="$branch_color$branchstring$c_clear"
-
-               if [ -n "$w$i$s$u$r$p" ]; then
-                       gitstring="$gitstring$z"
-               fi
-               if [ "$w" = "*" ]; then
-                       gitstring="$gitstring$bad_color$w"
-               fi
-               if [ -n "$i" ]; then
-                       gitstring="$gitstring$ok_color$i"
-               fi
-               if [ -n "$s" ]; then
-                       gitstring="$gitstring$flags_color$s"
-               fi
-               if [ -n "$u" ]; then
-                       gitstring="$gitstring$bad_color$u"
-               fi
-               gitstring="$gitstring$c_clear$r$p"
-               return
+       else
+               # Using \[ and \] around colors is necessary to prevent
+               # issues with command line editing/browsing/completion!
+               local c_red='\[\e[31m\]'
+               local c_green='\[\e[32m\]'
+               local c_lblue='\[\e[1;34m\]'
+               local c_clear='\[\e[0m\]'

        fi
        fi

-       local c_red='\e[31m'
-       local c_green='\e[32m'
-       local c_lblue='\e[1;34m'
-       local c_clear='\e[0m'

        local bad_color=$c_red
        local ok_color=$c_green
        local bad_color=$c_red
        local ok_color=$c_green

-       local branch_color="$c_clear"

        local flags_color="$c_lblue"
        local flags_color="$c_lblue"

-       local branchstring="$c${b##refs/heads/}"

 
 

+       local branch_color=""

        if [ $detached = no ]; then
                branch_color="$ok_color"
        else
                branch_color="$bad_color"
        fi
        if [ $detached = no ]; then
                branch_color="$ok_color"
        else
                branch_color="$bad_color"
        fi

+       c="$branch_color$c"
+       b="$b$c_clear"

 
 

-       # Setting gitstring directly with \[ and \] around colors
-       # is necessary to prevent wrapping issues!
-       gitstring="\[$branch_color\]$branchstring\[$c_clear\]"
-
-       if [ -n "$w$i$s$u$r$p" ]; then
-               gitstring="$gitstring$z"
-       fi

        if [ "$w" = "*" ]; then
        if [ "$w" = "*" ]; then

-               gitstring="$gitstring\[$bad_color\]$w"
+               w="$bad_color$w"

        fi
        if [ -n "$i" ]; then
        fi
        if [ -n "$i" ]; then

-               gitstring="$gitstring\[$ok_color\]$i"
+               i="$ok_color$i"

        fi
        if [ -n "$s" ]; then
        fi
        if [ -n "$s" ]; then

-               gitstring="$gitstring\[$flags_color\]$s"
+               s="$flags_color$s"

        fi
        if [ -n "$u" ]; then
        fi
        if [ -n "$u" ]; then

-               gitstring="$gitstring\[$bad_color\]$u"
+               u="$bad_color$u"

        fi
        fi

-       gitstring="$gitstring\[$c_clear\]$r$p"
+       r="$c_clear$r"

 }
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
 }
 
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)


@@ -443,19 +409,20 @@ __git_ps1 ()
                fi
 
                local z="${GIT_PS1_STATESEPARATOR-" "}"
                fi
 
                local z="${GIT_PS1_STATESEPARATOR-" "}"

+
+               # NO color option unless in PROMPT_COMMAND mode
+               if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+                       __git_ps1_colorize_gitstring
+               fi
+

                local f="$w$i$s$u"
                local f="$w$i$s$u"

+               local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
+

                if [ $pcmode = yes ]; then
                if [ $pcmode = yes ]; then

-                       local gitstring=
-                       if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-                               __git_ps1_colorize_gitstring
-                       else
-                               gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p"
-                       fi

                        gitstring=$(printf -- "$printf_format" "$gitstring")
                        PS1="$ps1pc_start$gitstring$ps1pc_end"
                else
                        gitstring=$(printf -- "$printf_format" "$gitstring")
                        PS1="$ps1pc_start$gitstring$ps1pc_end"
                else

-                       # NO color option unless in PROMPT_COMMAND mode
-                       printf -- "$printf_format" "$c${b##refs/heads/}${f:+$z$f}$r$p"
+                       printf -- "$printf_format" "$gitstring"

                fi
        fi
 }
                fi
        fi
 }