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

Fix add/remove with spaces/special characters

Browse Source
This commit is contained in:
Jacob Lukas
2011-11-09 12:45:38 -08:00
parent a1a7e3066e
commit 5e507af747
6 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ _gs_output_file_group() {
for i in ${stat_grp[$1]}; do
# Print colored hashes & files based on modification groups
local c_group="\e[0;$(eval echo -e \$c_grp_$1)"
# Deduce relative path based on current working directory
if [ -z "$project_root" ]; then
relative="${stat_file[$i]}"
@@ -128,13 +128,14 @@ _gs_output_file_group() {
dest="$project_root/${stat_file[$i]}"
relative="$(_gs_relative_path "$PWD" "$dest" )"
fi
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]}:\
$pad$c_dark [$c_rst$e$c_dark] $c_group$relative$c_rst"
# Export numbered variables in the order they are displayed.
# (Exports full path, but displays relative path)
export $git_env_char$e="$project_root/${stat_file[$i]}"
local filename=$(eval echo $(echo ${stat_file[$i]} | egrep -o '^"([^\\"]*(\\.[^"]*)*)"|^[^ ]+'))
export $git_env_char$e="$project_root/$filename"
let e++
done
echo -e "$c_hash#$c_rst"

8
lib/git/repo_index.sh
View File

@@ -91,7 +91,11 @@ function git_index() {
# Go to our base path
if [ -n "$base_path" ]; then
unset IFS
eval cd \"$base_path\" # eval turns ~ into $HOME
# evaluate ~ if necessary
if [[ "$base_path" == "~"* ]]; then
base_path=$(eval echo ${base_path%%/*})/${base_path#*/}
fi
cd "$base_path"
# Run git callback (either update or show changes), if we are in the root directory
if [ -z "${sub_path%/}" ]; then _git_index_update_or_status; fi
else
@@ -128,7 +132,7 @@ function _rebuild_git_index() {
if [ "$1" != "--silent" ]; then echo -e "== Scanning $GIT_REPO_DIR for git repos & submodules..."; fi
# Get repos from src dir and custom dirs, then sort by basename
local IFS=$'\n'
for repo in $(echo -e "$(_find_git_repos)\n$(echo $GIT_REPOS | sed "s/:/\n/g")"); do
for repo in $(echo -e "$(_find_git_repos)\n$(echo $GIT_REPOS | sed "s/:/\\\\n/g")"); do
echo $(basename $repo | sed "s/ /_/g") $repo
done | sort | cut -d " " -f2- > "$GIT_REPO_DIR/.git_index"

6
lib/git/status_shortcuts.rb
View File

@@ -131,7 +131,11 @@ def output_file_group(group)
puts "#{c_group}##{@c[:rst]} #{@c[h[:col]]}#{h[:msg]}:\
#{padding}#{@c[:dark]} [#{@c[:rst]}#{@e}#{@c[:dark]}] #{c_group}#{rel_file}#{@c[:rst]}"
# Save the ordered list of output files
@output_files << h[:file]
@output_files << if h[:file] =~ /^"([^\\"]*(\\.[^"]*)*)"/
$1.gsub(/\\(.)/,'\1')
else
h[:file].match(/^[^ ]*/)[0]
end
end
puts "#{c_group}##{@c[:rst]}" # Extra '#'

58
lib/git/status_shortcuts.sh
View File

@@ -74,17 +74,21 @@ git_add_shortcuts() {
# Does nothing if no args are given.
git_silent_add_shortcuts() {
if [ -n "$1" ]; then
# Expand args and process resulting set of files.
for file in $(git_expand_args "$@"); do
function process {
file=$1
# Use 'git rm' if file doesn't exist and 'ga_auto_remove' is enabled.
if [[ $ga_auto_remove == "yes" ]] && ! [ -e $file ]; then
if [[ $ga_auto_remove == "yes" ]] && ! [ -e "$file" ]; then
echo -n "# "
git rm $file
git rm "$file"
else
git add $file
git add "$file"
echo -e "# add '$file'"
fi
done
}
# Expand args and process resulting set of files.
eval for file in $(git_expand_args "$@")\; do process "\$file"\; done
echo "#"
fi
}
@@ -109,9 +113,10 @@ git_add_patch_shortcuts() {
git_silent_add_patch_shortcuts() {
if [ -n "$1" ]; then
# Expand args and process resulting set of files.
for file in $(git_expand_args "$@"); do
git add -p $file
echo -e "# add '$file'"
local IFS=$'\n'
eval for file in $(git_expand_args "$@")\; do\
git add -p "\$file"\;\
echo -e "# add '\$file'"\;\
done
echo "#"
fi
@@ -136,21 +141,36 @@ git_show_affected_files(){
# * git_status_shortcuts() - git status implementation
# * git_show_affected_files() - shows files affected by a given SHA1, etc.
git_expand_args() {
files=""
first=1
for arg in "$@"; do
if [[ "$arg" =~ ^[0-9]+$ ]] ; then # Substitute $e{*} variables for any integers
files="$files $(eval echo \$$git_env_char$arg)"
elif [[ $arg =~ ^[0-9]+\.\.[0-9]+$ ]]; then # Expand ranges into $e{*} variables
files="$files $(eval echo \$$git_env_char{$arg})"
if [ "$first" -eq 1 ]; then
first=0
else
echo -n " "
fi
eval printf '%q' "\$$git_env_char$arg"
elif [[ "$arg" =~ ^[0-9]+\.\.[0-9]+$ ]]; then # Expand ranges into $e{*} variables
for i in $(eval echo {$arg}); do
if [ "$first" -eq 1 ]; then
first=0
else
echo -n " "
fi
eval printf '%q' "\$$git_env_char$i"
done
else # Otherwise, treat $arg as a normal string.
# If arg contains any spaces, (re)wrap it in double quotes
if echo $arg | grep -q " "; then arg="\"$arg\""; fi
files="$files $arg"
if [ "$first" -eq 1 ]; then
first=0
else
echo -n " "
fi
printf '%q' "$arg"
fi
done
echo $files
}
# Execute a command with expanded args, e.g. Delete files 6 to 12: $ ge rm 6..12
# Fails if command is a number or range (probably not worth fixing)
exec_git_expand_args() { $(git_expand_args "$@"); }
# Clear numbered env variables
@@ -164,8 +184,8 @@ git_clear_vars() {
# Shortcuts for resolving merge conflicts.
ours(){ local files=$(git_expand_args "$@"); git checkout --ours $files; git add $files; }
theirs(){ local files=$(git_expand_args "$@"); git checkout --theirs $files; git add $files; }
ours(){ local files=$(git_expand_args "$@"); git checkout --ours "$files"; git add "$files"; }
theirs(){ local files=$(git_expand_args "$@"); git checkout --theirs "$files"; git add "$files"; }
# Git commit prompts