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

Merge pull request #120 from sblask/fix-issue-119-show-more-information-in-gs

Browse Source 
Let gs handle commits the branch is behind
This commit is contained in:
Nathan Broadbent
2013-11-04 13:11:44 -08:00
parent 878d81a4bd b7fa37e1f1
commit 7db526b295
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/git/status_shortcuts.rb
View File

@@ -26,7 +26,8 @@
git_branch = `\git branch -v 2> /dev/null` git_branch = `\git branch -v 2> /dev/null`
@branch = git_branch[/^\* (\(no branch\)|[^ ]*)/, 1] @branch = git_branch[/^\* (\(no branch\)|[^ ]*)/, 1]
@ahead = git_branch[/^\* [^ ]* *[^ ]* *\[ahead ?(\d+)\]/, 1] @ahead = git_branch[/^\* [^ ]* *[^ ]* *\[ahead ?(\d+).*\]/, 1]
@behind = git_branch[/^\* [^ ]* *[^ ]* *\[.*behind ?(\d+)\]/, 1]
@changes = @git_status.split("\n") @changes = @git_status.split("\n")
# Exit if too many changes # Exit if too many changes
@@ -68,20 +69,21 @@ exit if @changes.size > ENV["gs_max_changes"].to_i
# Counter for env variables # Counter for env variables
@e = 0 @e = 0
# Show how many commits ahead we are from origin # Show how many commits we are ahead and/or behind origin
ahead = @ahead ? " #{@c[:dark]}| #{@c[:new]}+#{@ahead}#{@c[:rst]}" : "" difference = ["-#{@behind}", "+#{@ahead}"].select{|d| d.length > 1}.join('/')
difference = difference.length > 0 ? " #{@c[:dark]}| #{@c[:new]}#{difference}#{@c[:rst]}" : ""
# If no changes, just display green no changes message and exit here # If no changes, just display green no changes message and exit here
if @git_status == "" if @git_status == ""
puts "%s#%s On branch: %s#{@branch}#{ahead} %s| \033[0;32mNo changes (working directory clean)%s" % [ puts "%s#%s On branch: %s#{@branch}#{difference} %s| \033[0;32mNo changes (working directory clean)%s" % [
@c[:dark], @c[:rst], @c[:branch], @c[:dark], @c[:rst] @c[:dark], @c[:rst], @c[:branch], @c[:dark], @c[:rst]
] ]
exit exit
end end
puts "%s#%s On branch: %s#{@branch}#{ahead} %s| [%s*%s]%s => $#{ENV["git_env_char"]}*\n%s#%s" % [ puts "%s#%s On branch: %s#{@branch}#{difference} %s| [%s*%s]%s => $#{ENV["git_env_char"]}*\n%s#%s" % [
@c[:dark], @c[:rst], @c[:branch], @c[:dark], @c[:rst], @c[:dark], @c[:rst], @c[:dark], @c[:rst] @c[:dark], @c[:rst], @c[:branch], @c[:dark], @c[:rst], @c[:dark], @c[:rst], @c[:dark], @c[:rst]
] ]