h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-29 00:21:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Switch to bare vars in our math invocations

Browse Source 
Using bare vars is more efficient because it makes the builtin `math`
expression cache more useful. That's because if you prefix each var with
a dollar-sign then the fish parser expands it before `math` is run.
Something like `math x + 1` can be cached since the expression is the
same each time it is run. But if you do `math $x + 1` and x==1 then you're
effectively executing `math 1 + 1`. And if x==2 the next time then you're
running `math 2 + 1`. Which makes the expression cache much less effective.
This commit is contained in:
Kurtis Rader
2017-08-24 12:38:10 -07:00
parent 56d9134534
commit bd18736ee5
12 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
share/functions/__fish_git_prompt.fish
View File

@@ -478,15 +478,19 @@ function __fish_git_prompt_informative_status
set -l changedFiles (command git diff --name-status | string match -r \\w)
set -l stagedFiles (command git diff --staged --name-status | string match -r \\w)
set -l dirtystate (math (count $changedFiles) - (count (string match -r "U" -- $changedFiles)) ^/dev/null)
set -l x (count $changedFiles)
set -l y (count (string match -r "U" -- $changedFiles))
set -l dirtystate (math x - y)
set -l x(count $stagedFiles)
set -l invalidstate (count (string match -r "U" -- $stagedFiles))
set -l stagedstate (math (count $stagedFiles) - $invalidstate ^/dev/null)
set -l stagedstate (math x - invalidstate)
set -l untrackedfiles (command git ls-files --others --exclude-standard | wc -l | string trim)
set -l info
# If `math` fails for some reason, assume the state is clean - it's the simpler path
set -l state (math $dirtystate + $invalidstate + $stagedstate + $untrackedfiles ^/dev/null)
# If `math` fails for some reason, assume the state is clean - it's the simpler path.
# TBD: Can this be simplified? It should be impossible for the math command to fail here.
set -l state (math dirtystate + invalidstate + stagedstate + untrackedfiles)
if test -z "$state"
or test "$state" = 0
set info $___fish_git_prompt_color_cleanstate$___fish_git_prompt_char_cleanstate$___fish_git_prompt_color_cleanstate_done