Archives/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish synced 2024-11-03 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

[bobthefish] Better (faster, stronger) SCM segments

Browse Source 
* Show the closest parent repo if $PWD is in both an hg and git repo.
 * Only find the repo root once per SCM, not two or three times :)
This commit is contained in:
Justin Hileman 2014-11-22 09:32:10 -08:00 committed by Bruno Pinto
parent a4ba3bc8e7
commit 4012de608d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
themes/bobthefish/fish_prompt.fish
View File

@ -66,13 +66,13 @@ set __bobthefish_lt_brown BF5E00
# Helper methods # Helper methods
# =========================== # ===========================
function __bobthefish_in_git -d 'Check whether pwd is inside a git repo' # function __bobthefish_in_git -d 'Check whether pwd is inside a git repo'
command which git > /dev/null 2>&1; and command git rev-parse --is-inside-work-tree >/dev/null 2>&1 # command which git > /dev/null 2>&1; and command git rev-parse --is-inside-work-tree >/dev/null 2>&1
end # end
function __bobthefish_in_hg -d 'Check whether pwd is inside a hg repo' # function __bobthefish_in_hg -d 'Check whether pwd is inside a hg repo'
command which hg > /dev/null 2>&1; and command hg stat > /dev/null 2>&1 # command which hg > /dev/null 2>&1; and command hg stat > /dev/null 2>&1
end # end
function __bobthefish_git_branch -d 'Get the current git branch (or commitish)' function __bobthefish_git_branch -d 'Get the current git branch (or commitish)'
set -l ref (command git symbolic-ref HEAD 2> /dev/null) set -l ref (command git symbolic-ref HEAD 2> /dev/null)
@ -239,7 +239,7 @@ function __bobthefish_prompt_hg -d 'Display the actual hg state'
set flag_fg fff set flag_fg fff
end end
__bobthefish_path_segment (__bobthefish_hg_project_dir) __bobthefish_path_segment $argv[1]
__bobthefish_start_segment $flag_bg $flag_fg __bobthefish_start_segment $flag_bg $flag_fg
echo -n -s $__bobthefish_hg_glyph ' ' echo -n -s $__bobthefish_hg_glyph ' '
@ -249,7 +249,7 @@ function __bobthefish_prompt_hg -d 'Display the actual hg state'
echo -n -s (__bobthefish_hg_branch) $flags ' ' echo -n -s (__bobthefish_hg_branch) $flags ' '
set_color normal set_color normal
set -l project_pwd (__bobthefish_project_pwd (__bobthefish_hg_project_dir)) set -l project_pwd (__bobthefish_project_pwd $argv[1])
if test "$project_pwd" if test "$project_pwd"
if test -w "$PWD" if test -w "$PWD"
__bobthefish_start_segment 333 999 __bobthefish_start_segment 333 999
@ -286,14 +286,14 @@ function __bobthefish_prompt_git -d 'Display the actual git state'
end end
end end
__bobthefish_path_segment (__bobthefish_git_project_dir) __bobthefish_path_segment $argv[1]
__bobthefish_start_segment $flag_bg $flag_fg __bobthefish_start_segment $flag_bg $flag_fg
set_color $flag_fg --bold set_color $flag_fg --bold
echo -n -s (__bobthefish_git_branch) $flags ' ' echo -n -s (__bobthefish_git_branch) $flags ' '
set_color normal set_color normal
set -l project_pwd (__bobthefish_project_pwd (__bobthefish_git_project_dir)) set -l project_pwd (__bobthefish_project_pwd $argv[1])
if test "$project_pwd" if test "$project_pwd"
if test -w "$PWD" if test -w "$PWD"
__bobthefish_start_segment 333 999 __bobthefish_start_segment 333 999
@ -343,10 +343,13 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome'
__bobthefish_prompt_status __bobthefish_prompt_status
__bobthefish_prompt_user __bobthefish_prompt_user
__bobthefish_prompt_virtualfish __bobthefish_prompt_virtualfish
if __bobthefish_in_git # TODO: do this right.
__bobthefish_prompt_git # if something is in both git and hg, check the length of set -l git_root (__bobthefish_git_project_dir)
else if __bobthefish_in_hg # __bobthefish_git_project_dir vs __bobthefish_hg_project_dir set -l hg_root (__bobthefish_hg_project_dir)
__bobthefish_prompt_hg # and pick the longer of the two. if test (echo "$hg_root" | wc -c) -gt (echo "$git_root" | wc -c)
__bobthefish_prompt_hg $hg_root
else if test "$git_root"
__bobthefish_prompt_git $git_root
else else
__bobthefish_prompt_dir __bobthefish_prompt_dir
end end