Merge remote-tracking branch 'sjl/master'

This commit is contained in:
Shawn Sorichetti 2011-05-02 15:34:13 -04:00
commit 915c88a73e
2 changed files with 14 additions and 14 deletions

View file

@ -17,16 +17,14 @@ export LC_CTYPE=en_US.UTF-8
function pman() { function pman() {
man $1 -t | open -f -a Preview man $1 -t | open -f -a Preview
} }
#
## pretty JSON ## pretty JSON
function pj() { function pj() {
python -mjson.tool python -mjson.tool
} }
## curl JSON
function cj() {
curl -sS $@ | pj
}
## Open current directory ## Open current directory
alias oo='open .' alias oo='open .'
@ -51,12 +49,10 @@ alias history='fc -l 1'
export GREP_OPTIONS='--color=auto' export GREP_OPTIONS='--color=auto'
export GREP_COLOR='1;32' export GREP_COLOR='1;32'
# What the hell did I do the other day? # Quick and dirty encryption
function whatthehelldididoon() { function encrypt() {
for repo in `find . -name '.hg'` openssl des3 -a -in $1 -out $1.des3
do }
echo $repo function decrypt() {
hg .. -R $repo/.. -d "$1" -u 'Steve Losh' openssl des3 -d -a -in $1 -out ${1%.des3}
done
} }

View file

@ -1,9 +1,13 @@
if [ "x$OH_MY_ZSH_HG" = "x" ]; then
OH_MY_ZSH_HG="hg"
fi
function virtualenv_info { function virtualenv_info {
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') ' [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
} }
function hg_prompt_info { function hg_prompt_info {
hg prompt --angle-brackets "\ $OH_MY_ZSH_HG prompt --angle-brackets "\
< on %{$fg[magenta]%}<branch>%{$reset_color%}>\ < on %{$fg[magenta]%}<branch>%{$reset_color%}>\
< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\ < at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}< %{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<