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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Florian Tham
2017-02-03 12:10:06 +01:00
parent d07a43d63c 86e1a5094c
commit 0883aa6ff4
7 changed files with 195 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/git/status_shortcuts.rb
View File

@@ -22,14 +22,15 @@
@project_root = File.exist?(".git") ? Dir.pwd : `\git rev-parse --show-toplevel 2> /dev/null`.strip
@git_status = `\git status --porcelain 2> /dev/null`
@git_status = `\git status --porcelain -b 2> /dev/null`
git_branch = `\git branch -v 2> /dev/null`
@branch = git_branch[/^\* (\(no branch\)|[^ ]*)/, 1]
@ahead = git_branch[/^\* [^ ]* *[^ ]* *\[ahead ?(\d+).*\]/, 1]
@behind = git_branch[/^\* [^ ]* *[^ ]* *\[.*behind ?(\d+)\]/, 1]
git_status_lines = @git_status.split("\n")
git_branch = git_status_lines[0]
@branch = git_branch[/^## (?:Initial commit on )?([^ \.]+)/, 1]
@ahead = git_branch[/\[ahead ?(\d+).*\]/, 1]
@behind = git_branch[/\[.*behind ?(\d+)\]/, 1]
@changes = @git_status.split("\n")
@changes = git_status_lines[1..-1]
# Exit if too many changes
exit if @changes.size > ENV["gs_max_changes"].to_i
@@ -131,7 +132,7 @@ end
# Extract the second file name from the format x -> y
quoted, unquoted = /^(?:"(?:[^"\\]|\\.)*"|[^"].*) -> (?:"((?:[^"\\]|\\.)*)"|(.*[^"]))$/.match(file)[1..2]
renamed_file = quoted || unquoted
@stat_hash[:unstaged] << {:msg => " modified", :col => :mod, :file => renamed_file}
@stat_hash[:unstaged] << {:msg => " modified", :col => :mod, :file => renamed_file}
elsif x != "R" && y == "M"
@stat_hash[:unstaged] << {:msg => " modified", :col => :mod, :file => file}
elsif y == "D" && x != "D" && x != "U"

7
lib/git/status_shortcuts.sh
View File

@@ -166,7 +166,12 @@ git_clear_vars() {
local i
for (( i=1; i<=$gs_max_changes; i++ )); do
# Stop clearing after first empty var
if [[ -z "$(eval echo "\${$git_env_char$i:-}")" ]]; then break; fi
local env_var_i=${git_env_char}${i}
if [[ -z "$(eval echo "\${$env_var_i:-}")" ]]; then
break
else
unset $env_var_i
fi
done
}