ab5f77a17eaa

--- a/.bashrc	Fri Jan 08 21:03:55 2010 -0500
+++ b/.bashrc	Fri Jan 08 21:04:38 2010 -0500
@@ -3,6 +3,7 @@
 alias hl='less -R'
 alias pm='python manage.py '
 alias oo='open .'
+alias j='z'
 alias flakes="find . -name '*.py' -print0 | xargs -0 pyflakes"
 alias fab='fab -i ~/.ssh/stevelosh'
 alias tweets-stevelosh='~/src/grabtweets/grabtweets.py -p ~/Documents/tweets/stevelosh'
@@ -31,7 +32,7 @@
 export R_LIBS="$HOME/lib/r"
 
 # Extra shell extensions like j and tab completion for Mercurial -------------
-source ~/lib/j2/j.sh
+source ~/lib/z/z.sh
 source ~/lib/hg/bash_completion
 source ~/lib/python/virtualenvwrapper/virtualenvwrapper_bashrc
 

--- a/.hgrc	Fri Jan 08 21:03:55 2010 -0500
+++ b/.hgrc	Fri Jan 08 21:04:38 2010 -0500
@@ -78,25 +78,20 @@
 
 
 [alias]
-
-killitwithfire = revert --no-backup --all
-kittens = parents
 fold = collapse
-slog = log --template '\033[33;40m{rev}\033[37;40m {desc|firstline} \033[1;30;40m({date|age} by {author|person})\033[0;37;40m \033[33;40m{tags}\033[37;40m\n'
 nudge = push --rev .
 tmd = diff --no-color -U 10
 cm = commit -m
-up = update --check
 ? = summary
 : = status
 
 show = log --template 'changeset:  {rev}:{node|short} \033[33;40m{tags}\033[37;40m\033[35;40m{branches}\033[37;40m\nauthor:     {author}\ndate:       {date|rfc822date} ({date|age} ago)\nsummary:    {desc|firstline}\n\nadded:   \033[32;40m{file_adds}\033[37;40m\nremoved: \033[31;40m{file_dels}\033[37;40m\nchanged: \033[36;40m{file_mods}\033[37;40m\n\n' --color=always -pr
 
-gl = glog -l8 --template 'changeset: {rev}:{node|short} \033[1;30;40m{author|person}\033[0;37;40m \033[33;40m{tags}\033[37;40m \033[35;40m{branches}\033[37;40m\nsummary:   {desc|firstline|fill68|tabindent|tabindent}\n\n'
+slog = log --template '\033[33;40m{rev}\033[37;40m {desc|firstline} \033[1;30;40m({date|age} by {author|person})\033[0;37;40m \033[33;40m{tags}\033[37;40m\n'
 
-gl+ = gl -l100000000
+. = slog -l15
 
-, = glog -l13 --template '\033[33;40m{rev} \033[37;40m{desc|firstline|fill68} \033[1;30;40m({date|age} by {author|person})\033[0;37;40m \033[33;40m{tags}\033[37;40m \033[35;40m{branches}\033[37;40m\n\n'
+, = glog -l10 --template '\033[33;40m{rev} \033[37;40m{desc|firstline|fill68} \n\033[35;40m{branches}\033[37;40m \033[33;40m{tags}\033[37;40m\033[1;30;40m({date|age} by {author|person})\033[0;37;40m\n\n'
 
 ,+ = , -l100000000