mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

49128 (github #76): vcs_info-examples: optimize +vi-git-untracked()

Browse source 
Speed up the prompt on large and/or deep working directories by
stopping grep(1) as soon as it finds a single match, with `-q`.
Also, correct the regexp by adding a ^ anchor and increase its
specificity by accounting for the space in Porcelain Format v1.

Previously, +vi-git-untracked() waited for grep(1) to find all
matches of untracked files, redirecting them away to /dev/null,
before finally concluding that untracked files do indeed exist.

With this patch, I see 4x speedup on a large Git-enabled $HOME:

    $ time (git status --porcelain | wc -l)
    212
    0.01s user 0.02s system 0% cpu 9.021 total

    $ time (git status --porcelain | grep '??' &>/dev/null)
    0.01s user 0.02s system 0% cpu 12.294 total

    $ time (git status --porcelain | grep -q '^?? ' 2>/dev/null)
    0.01s user 0.01s system 0% cpu 3.097 total

Note that `-q` for grep(1) is in POSIX (IEEE Std 1003.1-2017):
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/grep.html

See discussion https://www.zsh.org/mla/workers/2021/msg01354.html
This commit is contained in:
Suraj N. Kurapati 2021-06-25 23:04:05 -07:00 committed by Daniel Shahaf
parent d293c12de6
commit d634a3d333
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2021-07-06 Suraj N. Kurapati <sunaku@riseup.net>
* 49128 (github #76): Misc/vcs_info-examples: optimize
+vi-git-untracked()
2021-06-28 Peter Stephenson <p.stephenson@samsung.com> 2021-06-28 Peter Stephenson <p.stephenson@samsung.com>
* 49102: Src/subst.c: Dynamic directory expansion failure is * 49102: Src/subst.c: Dynamic directory expansion failure is

2
Misc/vcs_info-examples
View file

@ -160,7 +160,7 @@ zstyle ':vcs_info:git*+set-message:*' hooks git-untracked
+vi-git-untracked(){ +vi-git-untracked(){
if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' ]] && \ if [[ $(git rev-parse --is-inside-work-tree 2> /dev/null) == 'true' ]] && \
git status --porcelain | grep '??' &> /dev/null ; then git status --porcelain | grep -q '^?? ' 2> /dev/null ; then
# This will show the marker if there are any untracked files in repo. # This will show the marker if there are any untracked files in repo.
# If instead you want to show the marker only if there are untracked # If instead you want to show the marker only if there are untracked
# files in $PWD, use: # files in $PWD, use: