Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Experiment: ZSH only version of async files changes #83

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Experiment: ZSH only version of async files changes #83

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d46f27
ZSH only version of async files changes
michaeldfallen Oct 21, 2015
475e83b
Cleaned up async functionality, no more messy pid finding
michaeldfallen Nov 4, 2015
ca6b050
Remove unneeded pid finding function
michaeldfallen Nov 4, 2015
8645c05
Generalise the async approach
michaeldfallen Nov 4, 2015
96d6dc5
Only run async if the user wants us to
michaeldfallen Nov 4, 2015
30ff479
Don't need the PID now
michaeldfallen Nov 4, 2015
42448c4
Simplify the changes needed to make a function async
michaeldfallen Nov 4, 2015
142e448
Ensure outdated output isn't preferred
michaeldfallen Nov 4, 2015
ab2ed21
Make remote commits async
michaeldfallen Nov 4, 2015
d5941d4
Make local commits async
michaeldfallen Nov 4, 2015
962e7d5
Make stash status async
michaeldfallen Nov 4, 2015
fec7e01
Make branch name async
michaeldfallen Nov 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 32 additions & 7 deletions radar-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ get_fetch_time() {

FETCH_TIME="${GIT_RADAR_FETCH_TIME:-"$((5 * 60))"}"
echo $FETCH_TIME

}

prepare_bash_colors() {
Expand Down Expand Up @@ -410,8 +409,33 @@ untracked_status() {
printf '%s' "$untracked_string"
}

async_or_not() {
local function_to_run="$1"

GIT_RADAR_ASYNC_EXEC=${GIT_RADAR_ASYNC_EXEC:-false}
if $GIT_RADAR_ASYNC_EXEC; then
local file="$(dot_git)/async_git_radar_$1"

GIT_RADAR_REDRAW=${GIT_RADAR_REDRAW:-false}
if ! $GIT_RADAR_REDRAW; then
(
output="$($function_to_run)"
printf '%s' "$output" > $file
kill -s USR1 "$GIT_RADAR_ZSH_PID" # Tell the parent we are finished
) > /dev/null &
fi

if [[ -f $file ]]; then
cat $file
fi
else
eval $function_to_run
fi
}

color_changes_status() {
local separator="${1:- }"
local parent_pid="$1"
local separator="${2:- }"

local porcelain="$(porcelain_status)"
local changes=""
Expand Down Expand Up @@ -439,6 +463,7 @@ color_changes_status() {

changes="$staged_changes$conflicted_changes$unstaged_changes$untracked_changes"
fi

printf $PRINT_F_OPTION "${changes:1}"
}

Expand Down Expand Up @@ -558,39 +583,39 @@ render_prompt() {
sed_post="\(\:\([^%^{^}]*\)\)\{0,1\}}"

if [[ $output =~ ${if_pre}remote${if_post} ]]; then
remote_result="$(color_remote_commits)"
remote_result="$(async_or_not "color_remote_commits")"
if [[ -n "$remote_result" ]]; then
remote_sed="s/${sed_pre}remote${sed_post}/\2${remote_result}\4/"
else
remote_sed="s/${sed_pre}remote${sed_post}//"
fi
fi
if [[ $PROMPT_FORMAT =~ ${if_pre}branch${if_post} ]]; then
branch_result="$(readable_branch_name | sed -e 's/\//\\\//g')"
branch_result="$(async_or_not "readable_branch_name" | sed -e 's/\//\\\//g')"
if [[ -n "$branch_result" ]]; then
branch_sed="s/${sed_pre}branch${sed_post}/\2${branch_result}\4/"
else
branch_sed="s/${sed_pre}branch${sed_post}//"
fi
fi
if [[ $PROMPT_FORMAT =~ ${if_pre}local${if_post} ]]; then
local_result="$(color_local_commits)"
local_result="$(async_or_not "color_local_commits")"
if [[ -n "$local_result" ]]; then
local_sed="s/${sed_pre}local${sed_post}/\2$local_result\4/"
else
local_sed="s/${sed_pre}local${sed_post}//"
fi
fi
if [[ $PROMPT_FORMAT =~ ${if_pre}changes${if_post} ]]; then
changes_result="$(color_changes_status)"
changes_result="$(async_or_not "color_changes_status")"
if [[ -n "$changes_result" ]]; then
changes_sed="s/${sed_pre}changes${sed_post}/\2${changes_result}\4/"
else
changes_sed="s/${sed_pre}changes${sed_post}//"
fi
fi
if [[ $PROMPT_FORMAT =~ ${if_pre}stash${if_post} ]]; then
stash_result="$(stash_status)"
stash_result="$(async_or_not "stash_status")"
if [[ -n "$stash_result" ]]; then
stash_sed="s/${sed_pre}stash${sed_post}/\2${stash_result}\4/"
else
Expand Down