Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

git_prompt: Make informative separator configurable

Browse source 
It reuses $__fish_git_prompt_char_stateseparator, since it has a
similar meaning and goes otherwise unused when
$__fish_git_prompt_show_informative_status is set.
This commit is contained in:
Brian Gernhardt 2013-07-27 11:12:34 -04:00 committed by David Adam (zanchey)
parent b280cc5e75
commit 82b589e390
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
share/functions/__fish_git_prompt.fish
View file

@ -98,6 +98,7 @@
# upstream_prefix () # upstream_prefix ()
# upstream_ahead (↑) # upstream_ahead (↑)
# upstream_behind (↓) # upstream_behind (↓)
# stateseparator (|)
# dirtystate (✚) # dirtystate (✚)
# invalidstate (✖) # invalidstate (✖)
# stagedstate (●) # stagedstate (●)
@ -148,8 +149,9 @@
# #
# #
# The separator between the branch name and flags can also be customized via # The separator between the branch name and flags can also be customized via
# __fish_git_prompt_char_stateseparator. It defaults to a space ( ) and can # __fish_git_prompt_char_stateseparator. It can only be colored by
# only be colored by __fish_git_prompt_color. # __fish_git_prompt_color. It normally defaults to a space ( ) and defaults
# to a vertical bar (|) when __fish_git_prompt_show_informative_status is set.
# #
# The separator before the upstream information can be customized via # The separator before the upstream information can be customized via
# __fish_git_prompt_char_upstream_prefix. It is colored like the rest of # __fish_git_prompt_char_upstream_prefix. It is colored like the rest of
@ -358,7 +360,7 @@ function __fish_git_prompt --description "Prompt function for Git"
if test "true" = $inside_worktree if test "true" = $inside_worktree
if test -n "$__fish_git_prompt_show_informative_status" if test -n "$__fish_git_prompt_show_informative_status"
set informative_status "|"(__fish_git_prompt_informative_status) set informative_status "$___fish_git_prompt_char_stateseparator"(__fish_git_prompt_informative_status)
else else
if test -n "$__fish_git_prompt_showdirtystate" if test -n "$__fish_git_prompt_showdirtystate"
set -l config (git config --bool bash.showDirtyState) set -l config (git config --bool bash.showDirtyState)
@ -627,7 +629,7 @@ function __fish_git_prompt_validate_chars --description "__fish_git_prompt helpe
__fish_git_prompt_set_char __fish_git_prompt_char_invalidstate '#' '✖' __fish_git_prompt_set_char __fish_git_prompt_char_invalidstate '#' '✖'
__fish_git_prompt_set_char __fish_git_prompt_char_stagedstate '+' '●' __fish_git_prompt_set_char __fish_git_prompt_char_stagedstate '+' '●'
__fish_git_prompt_set_char __fish_git_prompt_char_stashstate '$' __fish_git_prompt_set_char __fish_git_prompt_char_stashstate '$'
__fish_git_prompt_set_char __fish_git_prompt_char_stateseparator ' ' __fish_git_prompt_set_char __fish_git_prompt_char_stateseparator ' ' '|'
__fish_git_prompt_set_char __fish_git_prompt_char_untrackedfiles '%' '…' __fish_git_prompt_set_char __fish_git_prompt_char_untrackedfiles '%' '…'
__fish_git_prompt_set_char __fish_git_prompt_char_upstream_ahead '>' '↑' __fish_git_prompt_set_char __fish_git_prompt_char_upstream_ahead '>' '↑'
__fish_git_prompt_set_char __fish_git_prompt_char_upstream_behind '<' '↓' __fish_git_prompt_set_char __fish_git_prompt_char_upstream_behind '<' '↓'