diff options
| author | Michael Allen <michael@michaelallen.io> | 2015-09-17 14:01:38 +0100 |
|---|---|---|
| committer | Michael Allen <michael@michaelallen.io> | 2015-09-17 14:01:38 +0100 |
| commit | 06e6a85ebd0d1090128079d0c7e31db43b591d27 (patch) | |
| tree | bd7c23cad4d9283d5754ffc85b24b252e77a004f /radar-base.sh | |
| parent | 49d6fcc1190066b38d1684f1cfd1d4fea3190d78 (diff) | |
| download | git-sonar-06e6a85ebd0d1090128079d0c7e31db43b591d27.tar.gz git-sonar-06e6a85ebd0d1090128079d0c7e31db43b591d27.zip | |
Switch remote commits to use suffixes
Diffstat (limited to 'radar-base.sh')
| -rwxr-xr-x | radar-base.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/radar-base.sh b/radar-base.sh index b85f75f..47bcdf7 100755 --- a/radar-base.sh +++ b/radar-base.sh @@ -31,7 +31,7 @@ prepare_bash_colors() { COLOR_BRANCH="\x01${GIT_RADAR_COLOR_BRANCH:-"\\033[0m"}\x02" MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"\\x01\\033[0m\\x02\\xF0\\x9D\\x98\\xAE\\x01\\033[0m\\x02"}" - PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote}%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}" + PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" \\x01\\033[1;30m\\x02git:(\\x01\\033[0m\\x02%{remote: }%{branch}%{ :local}\\x01\\033[1;30m\\x02)\\x01\\033[0m\\x02%{changes}"}" RESET_COLOR_LOCAL="\x01${GIT_RADAR_COLOR_LOCAL_RESET:-"\\033[0m"}\x02" RESET_COLOR_REMOTE="\x01${GIT_RADAR_COLOR_REMOTE_RESET:-"\\033[0m"}\x02" @@ -67,7 +67,7 @@ prepare_zsh_colors() { COLOR_BRANCH="%{${GIT_RADAR_COLOR_BRANCH:-$reset_color}%}" MASTER_SYMBOL="${GIT_RADAR_MASTER_SYMBOL:-"%{$reset_color%}$italic_m%{$reset_color%}"}" - PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote}%{branch}%{ :local}$fg_bold[grey])$reset_color%{changes}"}" + PROMPT_FORMAT="${GIT_RADAR_FORMAT:-" $fg_bold[grey]git:($reset_color%{remote: }%{branch}%{ :local}$fg_bold[grey])$reset_color%{changes}"}" RESET_COLOR_LOCAL="%{${GIT_RADAR_COLOR_LOCAL_RESET:-$reset_color}%}" RESET_COLOR_REMOTE="%{${GIT_RADAR_COLOR_REMOTE_RESET:-$reset_color}%}" @@ -445,14 +445,14 @@ color_remote_commits() { remote_behind="$(remote_behind_of_master "$remote_branch")" if [[ "$remote_behind" -gt "0" && "$remote_ahead" -gt "0" ]]; then - remote="$MASTER_SYMBOL $remote_behind $yellow_diverged_arrow $remote_ahead " + remote="$MASTER_SYMBOL $remote_behind $yellow_diverged_arrow $remote_ahead" elif [[ "$remote_ahead" -gt "0" ]]; then - remote="$MASTER_SYMBOL $green_ahead_arrow $remote_ahead " + remote="$MASTER_SYMBOL $green_ahead_arrow $remote_ahead" elif [[ "$remote_behind" -gt "0" ]]; then - remote="$MASTER_SYMBOL $remote_behind $red_behind_arrow " + remote="$MASTER_SYMBOL $remote_behind $red_behind_arrow" fi else - remote="upstream $not_upstream " + remote="upstream $not_upstream" fi printf $PRINT_F_OPTION "$remote" |