Skip to content

Switch untracked symbol #87

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

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

Switch untracked symbol #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8514fc2
Switch the untracked symbol to ?
michaeldfallen Oct 29, 2015
ce8fd0c
Those tests shouldn't have been commented out
michaeldfallen Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion radar-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ untracked_status() {
local filesUntracked="$(printf '%s' "$gitStatus" | grep "?? " | wc -l | grep -oEi '[1-9][0-9]*')"

if [ -n "$filesUntracked" ]; then
untracked_string="$untracked_string$filesUntracked${prefix}A${suffix}"
untracked_string="$untracked_string$filesUntracked${prefix}?${suffix}"
fi
printf '%s' "$untracked_string"
}
Expand Down
4 changes: 2 additions & 2 deletions test-colors.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ test_bash_colors_changes() {
touch bar
git add bar
echo "bar" > bar
untracked="1\x01changes-untracked\x02A\x01change-reset\x02"
untracked="1\x01changes-untracked\x02?\x01change-reset\x02"
unstaged="1\x01changes-unstaged\x02M\x01change-reset\x02"
staged="1\x01changes-staged\x02A\x01change-reset\x02"

Expand All @@ -481,7 +481,7 @@ test_zsh_colors_changes() {
touch bar
git add bar
echo "bar" > bar
untracked="1%{changes-untracked%}A%{change-reset%}"
untracked="1%{changes-untracked%}?%{change-reset%}"
unstaged="1%{changes-unstaged%}M%{change-reset%}"
staged="1%{changes-staged%}A%{change-reset%}"

Expand Down
2 changes: 1 addition & 1 deletion test-files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test_untracked_files() {
assertEquals "" "$(untracked_status)"

touch foo
assertEquals "1A" "$(untracked_status)"
assertEquals "1?" "$(untracked_status)"

git add .
assertEquals "" "$(untracked_status)"
Expand Down
220 changes: 110 additions & 110 deletions test-format-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,28 +91,28 @@ test_all_options_set_config() {
unset_colours

prompt="$(render_prompt)"
assertEquals "$prompt" "m 1 →foo1↑1A"
assertEquals "$prompt" "m 1 →foo1↑1?"

export GIT_RADAR_FORMAT="%{remote}%{branch}%{changes}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "$prompt" "m 1 →foo1A"
assertEquals "$prompt" "m 1 →foo1?"

export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "$prompt" "foo1↑1A"
assertEquals "$prompt" "foo1↑1?"

export GIT_RADAR_FORMAT="%{branch}%{changes}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "$prompt" "foo1A"
assertEquals "$prompt" "foo1?"

export GIT_RADAR_FORMAT="%{branch}"
prepare_zsh_colors
Expand All @@ -124,111 +124,111 @@ test_all_options_set_config() {
rm_tmp
}

#test_reorder_parts() {
# prepare_test_repo
#
# export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}%{remote}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "foo1↑1Am 1 →" "$prompt"
#
# export GIT_RADAR_FORMAT="%{local}%{changes}%{remote}%{branch}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "1↑1Am 1 →foo" "$prompt"
#
# export GIT_RADAR_FORMAT="%{changes}%{remote}%{branch}%{local}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "1Am 1 →foo1↑" "$prompt"
#
# rm_tmp
#}
#
#test_prefix_and_suffix_changes() {
# prepare_test_repo
#
# export GIT_RADAR_FORMAT="%{changes}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "1A" "$prompt"
#
# export GIT_RADAR_FORMAT="%{[:changes:]}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "[1A]" "$prompt"
#
# rm_tmp
#}
#
#test_prefix_and_suffix_local() {
# prepare_test_repo
#
# export GIT_RADAR_FORMAT="%{local}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "1↑" "$prompt"
#
# export GIT_RADAR_FORMAT="%{[:local:]}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "[1↑]" "$prompt"
#
# rm_tmp
#}
#
#test_prefix_and_suffix_branch() {
# prepare_test_repo
#
# export GIT_RADAR_FORMAT="%{branch}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "foo" "$prompt"
#
# export GIT_RADAR_FORMAT="%{[:branch:]}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "[foo]" "$prompt"
#
# rm_tmp
#}
#
#test_prefix_and_suffix_remote() {
# prepare_test_repo
#
# export GIT_RADAR_FORMAT="%{remote}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "m 1 →" "$prompt"
#
# export GIT_RADAR_FORMAT="%{[:remote:]}"
# prepare_zsh_colors
# unset_colours
#
# prompt="$(render_prompt)"
# assertEquals "[m 1 →]" "$prompt"
#
# rm_tmp
#}
test_reorder_parts() {
prepare_test_repo

export GIT_RADAR_FORMAT="%{branch}%{local}%{changes}%{remote}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "foo1↑1?m 1 →" "$prompt"

export GIT_RADAR_FORMAT="%{local}%{changes}%{remote}%{branch}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "1↑1?m 1 →foo" "$prompt"

export GIT_RADAR_FORMAT="%{changes}%{remote}%{branch}%{local}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "1?m 1 →foo1↑" "$prompt"

rm_tmp
}

test_prefix_and_suffix_changes() {
prepare_test_repo

export GIT_RADAR_FORMAT="%{changes}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "1?" "$prompt"

export GIT_RADAR_FORMAT="%{[:changes:]}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "[1?]" "$prompt"

rm_tmp
}

test_prefix_and_suffix_local() {
prepare_test_repo

export GIT_RADAR_FORMAT="%{local}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "1↑" "$prompt"

export GIT_RADAR_FORMAT="%{[:local:]}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "[1↑]" "$prompt"

rm_tmp
}

test_prefix_and_suffix_branch() {
prepare_test_repo

export GIT_RADAR_FORMAT="%{branch}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "foo" "$prompt"

export GIT_RADAR_FORMAT="%{[:branch:]}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "[foo]" "$prompt"

rm_tmp
}

test_prefix_and_suffix_remote() {
prepare_test_repo

export GIT_RADAR_FORMAT="%{remote}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "m 1 →" "$prompt"

export GIT_RADAR_FORMAT="%{[:remote:]}"
prepare_zsh_colors
unset_colours

prompt="$(render_prompt)"
assertEquals "[m 1 →]" "$prompt"

rm_tmp
}

. ./shunit/shunit2
2 changes: 1 addition & 1 deletion test-status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ UU modified-both-conflicted
assertEquals "line:${LINENO}" "1_U-1_T-1_B-"\
"$(conflicted_status "$status" "$prefix" "$suffix")"

assertEquals "line:${LINENO}" "1_A-"\
assertEquals "line:${LINENO}" "1_?-"\
"$(untracked_status "$status" "$prefix" "$suffix")"
}

Expand Down