Fix right prompt git commit count

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -1,4 +1,4 @@
-<img src="https://dl.dropboxusercontent.com/u/56336/omf/omf-logo-optimised.svg" align="left" width="144px" height="144px"/>
+<img src="https://cloud.githubusercontent.com/assets/8317250/7785620/0059f784-01d3-11e5-8a01-8edf6c4e2af7.png" align="left" width="144px" height="144px"/>
 
 #### Batman
 > A [Oh My Fish][omf-link] theme inspired by Batman.
@@ -20,7 +20,7 @@ _From left to right:_
 + `^` character denotes the current repository has [_stashed_](https://git-scm.com/book/no-nb/v1/Git-Tools-Stashing) changes.
 + `*` character denotes the current repository is dirty.
 + Display current branch.
-+ Display number of commits in relation to the current branch.
++ Display number of commits in relation to the origin of current branch.
 + Display current time.
 + _Batman_ inspired colors.
 
@@ -36,7 +36,6 @@ _From left to right:_
 
 > __Disclaimer:__ This work is not intended to infringe on any rights by and of the companies and/or individuals involved in the production of any series mentioned here. I don't own Batman.
 
-
 [mit]:            http://opensource.org/licenses/MIT
 [author]:         http://about.bucaran.me
 [omf-link]:       https://www.github.com/oh-my-fish/oh-my-fish

fish_greeting.fish

@@ -1,3 +1,3 @@
 function fish_greeting
-  echo (__batman_color_dim)(uname -mnprs)(__batman_color_off)
+    echo -n ''
 end

fish_prompt.fish

@@ -1,20 +1,20 @@
 function fish_prompt
-  test $status -ne 0;
-    and set -l colors 600 900 c00
-    or set -l colors 333 666 aaa
+    test $status -ne 0
+        and set -l colors 600 900 c00
+        or set -l colors 333 666 aaa
 
-  set -l pwd (prompt_pwd)
-  set -l base (basename "$pwd")
+    set -l pwd (prompt_pwd)
+    set -l base (basename "$pwd")
 
-  set -l expr "s|~|"(__batman_color_fst)"^^"(__batman_color_off)"|g; \
-               s|/|"(__batman_color_snd)"/"(__batman_color_off)"|g;  \
-               s|"$base"|"(__batman_color_fst)$base(__batman_color_off)" |g"
+    set -l expr "s|~|"(__color_primary)"^^"(__color_off)"|g; \
+               s|/|"(__color_secondary)"/"(__color_off)"|g;  \
+               s|"$base"|"(__color_primary)$base(__color_off)" |g"
 
-  echo -n (echo "$pwd" | sed -e $expr)(__batman_color_off)
+    echo -n (echo "$pwd" | sed -e $expr)(__color_off)
 
-  for color in $colors
-    echo -n (set_color $color)">"
-  end
+    for color in $colors
+        echo -n (set_color $color)">"
+    end
 
-  echo -n " "
+    echo -n " "
 end

fish_right_prompt.fish

@@ -1,43 +1,115 @@
 function git::is_stashed
-  command git rev-parse --verify --quiet refs/stash >/dev/null
+    command git rev-parse --verify --quiet refs/stash >/dev/null
 end
 
-function git::get_ahead_count
-  echo (command git log 2> /dev/null | grep '^commit' | wc -l | tr -d " ")
+function git::print::is_stashed
+    if git::is_stashed
+        echo (__color_tertiary)"^"(__color_off)
+    else
+        echo ""
+    end
 end
 
 function git::branch_name
-  command git symbolic-ref --short HEAD
+    if git symbolic-ref --short HEAD >/dev/null 2>&1
+        echo (command git symbolic-ref --short HEAD 2> /dev/null)
+    else
+        echo (command git rev-parse --short HEAD)
+    end
+end
+
+function git::print::branch_name
+    echo (__color_primary)(git::branch_name)
 end
 
 function git::is_touched
-  test -n (echo (command git status --porcelain))
+    test -n (echo (command git status --porcelain))
 end
 
-function fish_right_prompt
-  set -l code $status
-  test $code -ne 0; and echo (__batman_color_dim)"("(__batman_color_trd)"$code"(__batman_color_dim)") "(__batman_color_off)
-
-  if test -n "$SSH_CONNECTION"
-     printf (__batman_color_trd)":"(__batman_color_dim)"$HOSTNAME "(__batman_color_off)
-   end
-
-  if git rev-parse 2> /dev/null
-    git::is_stashed; and echo (__batman_color_trd)"^"(__batman_color_off)
-    printf (__batman_color_snd)"("(begin
-      if git::is_touched
-        echo (__batman_color_trd)"*"(__batman_color_off)
-      else
+function git::print::is_touched
+    if git::is_touched
+        echo (__color_tertiary)"*"(__color_off)
+    else
         echo ""
-      end
-    end)(__batman_color_fst)(git::branch_name)(__batman_color_snd)(begin
-      set -l count (git::get_ahead_count)
-        if test $count -eq 0
-          echo ""
-        else
-          echo (__batman_color_trd)"+"(__batman_color_fst)$count
+    end
+end
+
+function git::remote_info
+
+    set -l branch $argv[1]
+    set -l remote_name (git config branch.$branch.remote)
+
+    if test -n "$remote_name"
+        set merge_name (git config branch.$branch.merge)
+        set merge_name_short (echo $merge_name | cut -c 12-)
+    else
+        set remote_name "origin"
+        set merge_name "refs/heads/$branch"
+        set merge_name_short $branch
+    end
+
+    if test $remote_name = '.' # local
+        set remote_ref $merge_name
+    else
+        set remote_ref "refs/remotes/$remote_name/$merge_name_short"
+    end
+
+    set -l rev_git (eval "git rev-list --left-right $remote_ref...HEAD" 2> /dev/null)
+    if test $status != "0"
+        set rev_git (eval "git rev-list --left-right $merge_name...HEAD")
+    end
+
+    for i in $rev_git
+        if echo $i | grep '>' >/dev/null
+            set isAhead $isAhead ">"
         end
-    end)(__batman_color_snd)") "(__batman_color_off)
-  end
-  printf (__batman_color_dim)(date +%H(__batman_color_fst):(__batman_color_dim)%M(__batman_color_fst):(__batman_color_dim)%S)(__batman_color_off)" "
+    end
+
+    set -l remote_diff (count $rev_git)
+    set -l ahead (count $isAhead)
+    set -l behind (math $remote_diff - $ahead)
+
+    echo $ahead
+    echo $behind
+
+end
+
+function git::print::remote_info
+
+    set -l remote (git::remote_info (git::branch_name))
+    set -l ahead $remote[1]
+    set -l behind $remote[2]
+
+    if test $ahead != "0"
+        echo (__color_tertiary)" +"(__color_primary)$ahead
+    end
+
+    if test $behind != "0"
+        echo (__color_tertiary)" -"(__color_primary)$behind
+    end
+end
+
+function git::print
+    if git rev-parse 2>/dev/null
+        echo (git::print::is_stashed)
+        echo (__color_secondary)"("
+        echo (git::print::is_touched)
+        echo (git::print::branch_name)
+        echo (git::print::remote_info)
+        echo (__color_secondary)") "
+        echo (__color_off)
+    end
+end
+
+function fish_right_prompt
+    set -l code $status
+    test $code -ne 0; and echo (__color_dim)"("(__color_tertiary)"$code"(__color_dim)") "(__color_off)
+
+    if test -n "$SSH_CONNECTION"
+        printf (__color_tertiary)":"(__color_dim)"$HOSTNAME "(__color_off)
+    end
+
+    git::print
+
+    printf (__color_dim)(date +%H(__color_primary):(__color_dim)%M(__color_primary):(__color_dim)%S)(__color_off)" "
 end

fish_title.fish

@@ -1,3 +1,3 @@
 function fish_title
-  echo "$PWD | $_" | sed "s|$HOME|~|g"
-end
+    echo "$PWD | $_" | sed "s|$HOME|~|g"
+end

functions/__color_dim.fish

@@ -0,0 +1 @@
+function __color_dim; set_color 666; end

functions/__color_off.fish

@@ -0,0 +1 @@
+function __color_off; set_color normal; end

functions/__color_primary.fish

@@ -0,0 +1 @@
+function __color_primary; set_color -o fa0; end

functions/__color_secondary.fish

@@ -0,0 +1 @@
+function __color_secondary; set_color -o 36f; end

functions/__color_tertiary.fish

@@ -0,0 +1 @@
+function __color_tertiary; set_color -o f06; end