Permalink
Browse files

YESSS

  • Loading branch information...
seejohnrun committed Jun 13, 2012
1 parent efa784e commit 1536e313466878e8e142bd98b4a04ba15c913432
Showing with 189 additions and 31 deletions.
  1. +0 −31 .bash_profile
  2. +74 −0 .zsh/git-prompt/gitstatus.py
  3. +94 −0 .zsh/git-prompt/zshrc
  4. +19 −0 .zshrc
  5. +2 −0 .zshrc~
View
@@ -1,31 +0,0 @@
-# Set the path
-export PATH="~/Scripts:~/Development/ino/bin:/usr/local/bin:~/pear/bin:$PATH"
-
-# Alias vim to vi
-alias vim="vi"
-
-# Increase ULIMIT
-ulimit -n 1024
-
-# Colors!
-export CLICOLOR=1
-
-# i work for brewster
-export BREWSTER_USER=john
-
-# export GREP_OPTIONS='--color=auto -n'
-# export GREP_COLOR='0;93'
-
-# ps1 with git
-GIT_COMPLETION_PATH=/etc/bash_completion.d/git
-if [ -f $GIT_COMPLETION_PATH ]; then
- . $GIT_COMPLETION_PATH
- GIT_PS1_SHOWDIRTYSTATE=true # */+ for dirty
- GIT_PS1_SHOWSTASHSTATE=true # $ for stashes
- GIT_PS1_SHOWUNTRACKEDFILES=true # % for untracked
-fi
-
-# Give some nice prompt, with git inside of it
-export PS1="\e[0;33m\w\e[0;91m\$(__git_ps1 ' (%s)')\e[0;96m \$\e[0m "
-
-export TERM=xterm-256color
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+from __future__ import print_function
+
+# change those symbols to whatever you prefer
+symbols = {'ahead of': '', 'behind': '', 'prehash':':'}
+
+from subprocess import Popen, PIPE
+
+import sys
+gitsym = Popen(['git', 'symbolic-ref', 'HEAD'], stdout=PIPE, stderr=PIPE)
+branch, error = gitsym.communicate()
+
+error_string = error.decode('utf-8')
+
+if error_string.find('fatal: Not a git repository') != -1:
+ sys.exit(0)
+
+branch = branch.strip()[11:]
+
+res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate()
+err_string = err.decode('utf-8')
+if err_string.find('fatal') != -1:
+ sys.exit(0)
+changed_files = [namestat[0] for namestat in res.splitlines()]
+staged_files = [namestat[0] for namestat in Popen(['git','diff', '--staged','--name-status'], stdout=PIPE).communicate()[0].splitlines()]
+nb_changed = len(changed_files) - changed_files.count('U')
+nb_U = staged_files.count('U')
+nb_staged = len(staged_files) - nb_U
+staged = str(nb_staged)
+conflicts = str(nb_U)
+changed = str(nb_changed)
+nb_untracked = len(Popen(['git','ls-files','--others','--exclude-standard'],stdout=PIPE).communicate()[0].splitlines())
+untracked = str(nb_untracked)
+if not nb_changed and not nb_staged and not nb_U and not nb_untracked:
+ clean = '1'
+else:
+ clean = '0'
+
+remote = ''
+
+if not branch: # not on any branch
+ branch = symbols['prehash']+ Popen(['git','rev-parse','--short','HEAD'], stdout=PIPE).communicate()[0][:-1]
+else:
+ remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].strip()
+ if remote_name:
+ merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].strip()
+ if remote_name == '.': # local
+ remote_ref = merge_name
+ else:
+ remote_ref = 'refs/remotes/%s/%s' % (remote_name, merge_name[11:])
+ revgit = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % remote_ref],stdout=PIPE, stderr=PIPE)
+ revlist = revgit.communicate()[0]
+ if revgit.poll(): # fallback to local
+ revlist = Popen(['git', 'rev-list', '--left-right', '%s...HEAD' % merge_name],stdout=PIPE, stderr=PIPE).communicate()[0]
+ behead = revlist.splitlines()
+ ahead = len([x for x in behead if x[0]=='>'])
+ behind = len(behead) - ahead
+ if behind:
+ remote += '%s%s' % (symbols['behind'], behind)
+ if ahead:
+ remote += '%s%s' % (symbols['ahead of'], ahead)
+
+out = '\n'.join([
+ str(branch),
+ remote,
+ staged,
+ conflicts,
+ changed,
+ untracked,
+ clean])
+print(out)
+
View
@@ -0,0 +1,94 @@
+# To install source this file from your .zshrc file
+
+# Change this to reflect your installation directory
+export __GIT_PROMPT_DIR=~/.zsh/git-prompt
+# Initialize colors.
+autoload -U colors
+colors
+
+# Allow for functions in the prompt.
+setopt PROMPT_SUBST
+
+autoload -U add-zsh-hook
+
+add-zsh-hook chpwd chpwd_update_git_vars
+add-zsh-hook preexec preexec_update_git_vars
+add-zsh-hook precmd precmd_update_git_vars
+
+## Function definitions
+function preexec_update_git_vars() {
+ case "$2" in
+ git*)
+ __EXECUTED_GIT_COMMAND=1
+ ;;
+ esac
+}
+
+function precmd_update_git_vars() {
+ if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ -n "$ZSH_THEME_GIT_PROMPT_NOCACHE" ]; then
+ update_current_git_vars
+ unset __EXECUTED_GIT_COMMAND
+ fi
+}
+
+function chpwd_update_git_vars() {
+ update_current_git_vars
+}
+
+function update_current_git_vars() {
+ unset __CURRENT_GIT_STATUS
+
+ local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py"
+ _GIT_STATUS=`python ${gitstatus}`
+ __CURRENT_GIT_STATUS=("${(@f)_GIT_STATUS}")
+ GIT_BRANCH=$__CURRENT_GIT_STATUS[1]
+ GIT_REMOTE=$__CURRENT_GIT_STATUS[2]
+ GIT_STAGED=$__CURRENT_GIT_STATUS[3]
+ GIT_CONFLICTS=$__CURRENT_GIT_STATUS[4]
+ GIT_CHANGED=$__CURRENT_GIT_STATUS[5]
+ GIT_UNTRACKED=$__CURRENT_GIT_STATUS[6]
+ GIT_CLEAN=$__CURRENT_GIT_STATUS[7]
+}
+
+
+git_super_status() {
+ if [ -n "$__CURRENT_GIT_STATUS" ]; then
+ STATUS="($GIT_BRANCH"
+ STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
+ if [ -n "$GIT_REMOTE" ]; then
+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_REMOTE$GIT_REMOTE%{${reset_color}%}"
+ fi
+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
+ if [ "$GIT_STAGED" -ne "0" ]; then
+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
+ fi
+ if [ "$GIT_CONFLICTS" -ne "0" ]; then
+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
+ fi
+ if [ "$GIT_CHANGED" -ne "0" ]; then
+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
+ fi
+ if [ "$GIT_UNTRACKED" -ne "0" ]; then
+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
+ fi
+ if [ "$GIT_CLEAN" -eq "1" ]; then
+ STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
+ fi
+ STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ echo "$STATUS"
+ fi
+}
+
+# Default values for the appearance of the prompt. Configure at will.
+ZSH_THEME_GIT_PROMPT_PREFIX=" ("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_GIT_PROMPT_SEPARATOR="|"
+ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
+ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}●"
+ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}✖"
+ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}✚"
+ZSH_THEME_GIT_PROMPT_REMOTE=""
+ZSH_THEME_GIT_PROMPT_UNTRACKED=""
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}✔"
+
+
View
19 .zshrc
@@ -0,0 +1,19 @@
+# Git Prompt
+source $HOME/.zsh/git-prompt/zshrc
+
+# Solarized Colors
+BLACK=$'\033[0m'
+RED=$'\033[38;5;167m'
+GREEN=$'\033[38;5;71m'
+BLUE=$'\033[38;5;111m'
+YELLOW=$'\033[38;5;228m'
+ORANGE=$'\033[38;5;173m'
+
+# Some custom search paths
+export PATH="$HOME/Scripts:/usr/local/bin:$HOME/pear/bin:$PATH"
+
+# Colors
+export CLICOLOR=1
+
+# Prompt
+PROMPT='$YELLOW${(%):-%~}%f$(git_super_status) %# '
View
@@ -0,0 +1,2 @@
+source $HOME/.zsh/git-prompt/zshrc
+PROMPT='%B%m%~%b$(git_super_status) %# '

0 comments on commit 1536e31

Please sign in to comment.