flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix whitespace

Browse Source
This commit is contained in:
Jacob Lukas
2011-11-09 20:11:24 -08:00
parent 5e507af747
commit bfe91e04f0
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/git/fallback/status_shortcuts_shell.sh
View File

@@ -120,7 +120,7 @@ _gs_output_file_group() {
for i in ${stat_grp[$1]}; do for i in ${stat_grp[$1]}; do
# Print colored hashes & files based on modification groups # Print colored hashes & files based on modification groups
local c_group="\e[0;$(eval echo -e \$c_grp_$1)" local c_group="\e[0;$(eval echo -e \$c_grp_$1)"
# Deduce relative path based on current working directory # Deduce relative path based on current working directory
if [ -z "$project_root" ]; then if [ -z "$project_root" ]; then
relative="${stat_file[$i]}" relative="${stat_file[$i]}"
@@ -128,7 +128,7 @@ _gs_output_file_group() {
dest="$project_root/${stat_file[$i]}" dest="$project_root/${stat_file[$i]}"
relative="$(_gs_relative_path "$PWD" "$dest" )" relative="$(_gs_relative_path "$PWD" "$dest" )"
fi fi
if [[ $f -gt 10 && $e -lt 10 ]]; then local pad=" "; else local pad=""; fi # (padding) if [[ $f -gt 10 && $e -lt 10 ]]; then local pad=" "; else local pad=""; fi # (padding)
echo -e "$c_hash#$c_rst ${stat_col[$i]}${stat_msg[$i]}:\ echo -e "$c_hash#$c_rst ${stat_col[$i]}${stat_msg[$i]}:\
$pad$c_dark [$c_rst$e$c_dark] $c_group$relative$c_rst" $pad$c_dark [$c_rst$e$c_dark] $c_group$relative$c_rst"

3
lib/git/status_shortcuts.sh
View File

@@ -74,7 +74,6 @@ git_add_shortcuts() {
# Does nothing if no args are given. # Does nothing if no args are given.
git_silent_add_shortcuts() { git_silent_add_shortcuts() {
if [ -n "$1" ]; then if [ -n "$1" ]; then
function process { function process {
file=$1 file=$1
# Use 'git rm' if file doesn't exist and 'ga_auto_remove' is enabled. # Use 'git rm' if file doesn't exist and 'ga_auto_remove' is enabled.
@@ -86,7 +85,7 @@ git_silent_add_shortcuts() {
echo -e "# add '$file'" echo -e "# add '$file'"
fi fi
} }
# Expand args and process resulting set of files. # Expand args and process resulting set of files.
eval for file in $(git_expand_args "$@")\; do process "\$file"\; done eval for file in $(git_expand_args "$@")\; do process "\$file"\; done
echo "#" echo "#"

6
test/lib/git/repo_index_test.sh
View File

@@ -30,9 +30,7 @@ oneTimeSetUp() {
git_index_file="$GIT_REPO_DIR/.git_index" git_index_file="$GIT_REPO_DIR/.git_index"
silentGitCommands silentGitCommands
echo "Using repo dir $GIT_REPO_DIR"
cd $GIT_REPO_DIR cd $GIT_REPO_DIR
# Setup test repos in temp repo dir # Setup test repos in temp repo dir
for repo in github bitbucket source_forge; do for repo in github bitbucket source_forge; do
@@ -93,7 +91,7 @@ index_no_newlines() {
test_repo_index_command() { test_repo_index_command() {
git_index --rebuild > /dev/null git_index --rebuild > /dev/null
# Test that all repos are detected, and sorted alphabetically # Test that all repos are detected, and sorted alphabetically
assertIncludes "$(index_no_newlines)" "bitbucket.*\ assertIncludes "$(index_no_newlines)" "bitbucket.*\
blue_submodule.*\ blue_submodule.*\