stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite _lp_upwards_find for speed (#255)

Browse Source
This commit is contained in:
Olivier Mengué 2013-12-30 19:37:32 +01:00
parent 5e63fca606
commit e92a8e2630
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
liquidprompt
View File

@ -837,19 +837,14 @@ _lp_git_branch_color()
# the given name. Used to avoid invoking 'hg' and 'bzr'. # the given name. Used to avoid invoking 'hg' and 'bzr'.
_lp_upwards_find() _lp_upwards_find()
{ {
while [[ "$PWD" != "/" ]] ; do local dir
dir="$PWD"
# See if it's in the current directory. while [[ -n "$dir" ]]
local found="$(find "$PWD"/ -maxdepth 1 -name "$@" 2> /dev/null)" do
[[ -d "$dir/$1" ]] && return 0
# If it is, then echo the path (or anything), and return. dir="${dir%/*}"
if [[ -n "$found" ]] ; then
echo $found
return
fi
cd ..
done done
return 1
} }
# MERCURIAL # # MERCURIAL #
@ -862,7 +857,7 @@ _lp_hg_branch()
# First do a simple search to avoid having to invoke hg -- at least on my # First do a simple search to avoid having to invoke hg -- at least on my
# machine, the python startup causes a noticeable hitch when changing # machine, the python startup causes a noticeable hitch when changing
# directories. # directories.
[[ -z "$(_lp_upwards_find '.hg')" ]] && return _lp_upwards_find .hg || return
# We found an .hg folder, so we need to invoke hg and see if we're actually # We found an .hg folder, so we need to invoke hg and see if we're actually
# in a repository. # in a repository.
@ -1090,7 +1085,7 @@ _lp_bzr_branch()
# First do a simple search to avoid having to invoke bzr -- at least on my # First do a simple search to avoid having to invoke bzr -- at least on my
# machine, the python startup causes a noticeable hitch when changing # machine, the python startup causes a noticeable hitch when changing
# directories. # directories.
[[ -z "$(_lp_upwards_find '.bzr')" ]] && return _lp_upwards_find .bzr || return
# We found an .bzr folder, so we need to invoke bzr and see if we're # We found an .bzr folder, so we need to invoke bzr and see if we're
# actually in a repository. # actually in a repository.
@ -1115,7 +1110,7 @@ _lp_bzr_branch_color()
# First do a simple search to avoid having to invoke bzr -- at least on my # First do a simple search to avoid having to invoke bzr -- at least on my
# machine, the python startup causes a noticeable hitch when changing # machine, the python startup causes a noticeable hitch when changing
# directories. # directories.
[[ -z "$(_lp_upwards_find '.bzr')" ]] && return _lp_upwards_find .bzr || return
# We found an .bzr folder, so we need to invoke bzr and see if we're # We found an .bzr folder, so we need to invoke bzr and see if we're
# actually in a repository. # actually in a repository.