bugfix: make fish 3.3. compatible
This commit is contained in:
@ -1,107 +0,0 @@
|
||||
# Colors
|
||||
function orange
|
||||
set_color -o ee5819
|
||||
end
|
||||
|
||||
function yellow
|
||||
set_color -o b58900
|
||||
end
|
||||
|
||||
function red
|
||||
set_color -o d30102
|
||||
end
|
||||
|
||||
function cyan
|
||||
set_color -o 2aa198
|
||||
end
|
||||
|
||||
function white
|
||||
set_color -o fdf6e3
|
||||
end
|
||||
|
||||
function dim
|
||||
set_color -o 4f4f4f
|
||||
end
|
||||
|
||||
function off
|
||||
set_color -o normal
|
||||
end
|
||||
|
||||
# Git
|
||||
function git::is_repo
|
||||
test -d .git; or command git rev-parse --git-dir >/dev/null ^/dev/null
|
||||
end
|
||||
|
||||
function git::ahead -a ahead behind diverged none
|
||||
not git::is_repo; and return
|
||||
|
||||
set -l commit_count (command git rev-list --count --left-right "@{upstream}...HEAD" ^/dev/null)
|
||||
|
||||
switch "$commit_count"
|
||||
case ""
|
||||
# no upstream
|
||||
case "0"\t"0"
|
||||
test -n "$none"; and echo "$none"; or echo ""
|
||||
case "*"\t"0"
|
||||
test -n "$behind"; and echo "$behind"; or echo "-"
|
||||
case "0"\t"*"
|
||||
test -n "$ahead"; and echo "$ahead"; or echo "+"
|
||||
case "*"
|
||||
test -n "$diverged"; and echo "$diverged"; or echo "±"
|
||||
end
|
||||
end
|
||||
|
||||
function git::branch_name
|
||||
git::is_repo; and begin
|
||||
command git symbolic-ref --short HEAD ^/dev/null;
|
||||
or command git show-ref --head -s --abbrev | head -n1 ^/dev/null
|
||||
end
|
||||
end
|
||||
|
||||
function git::is_dirty
|
||||
git::is_repo; and not command git diff --no-ext-diff --quiet --exit-code
|
||||
end
|
||||
|
||||
function git::is_staged
|
||||
git::is_repo; and begin
|
||||
not command git diff --cached --no-ext-diff --quiet --exit-code
|
||||
end
|
||||
end
|
||||
|
||||
function git::is_stashed
|
||||
git::is_repo; and begin
|
||||
command git rev-parse --verify --quiet refs/stash >/dev/null
|
||||
end
|
||||
end
|
||||
|
||||
function git::is_touched
|
||||
git::is_repo; and begin
|
||||
test -n (echo (command git status --porcelain))
|
||||
end
|
||||
end
|
||||
|
||||
function git::untracked
|
||||
git::is_repo; and begin
|
||||
command git ls-files --other --exclude-standard
|
||||
end
|
||||
end
|
||||
|
||||
function fish_right_prompt
|
||||
|
||||
if test "$theme_complete_path" = "yes"
|
||||
set cwd (prompt_pwd)
|
||||
else
|
||||
set cwd (basename (prompt_pwd))
|
||||
|
||||
if git::is_repo
|
||||
set root_folder (command git rev-parse --show-toplevel ^/dev/null)
|
||||
set parent_root_folder (dirname $root_folder)
|
||||
set cwd (echo $PWD | sed -e "s|$parent_root_folder/||")
|
||||
end
|
||||
end
|
||||
|
||||
# Because of having a two line promt now we dont need right anymore so we dont print anything here atm
|
||||
#printf (yellow)"("(off)$cwd(yellow)") "(off)
|
||||
#printf (off)(date +%H(yellow):(off)%M(yellow):(off)%S)(off)"\n"
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user