--- a/.bashrc	Tue Apr 23 13:11:51 2013 -0400
+++ b/.bashrc	Wed Apr 24 11:40:27 2013 -0400
@@ -29,6 +29,7 @@
 }
 export PAGER=less
 export EDITOR=vim
+export HGEDITOR=$HOME/bin/hgeditor
 export RUBYLIB=$HOME/Installs/rubygems/lib
 export GEM_HOME=$HOME/Installs/rubygems/gems
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/hgeditor	Wed Apr 24 11:40:27 2013 -0400
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+HGTMP=""
+cleanup_exit() {
+    rm -rf "$HGTMP"
+}
+
+# Remove temporary files even if we get interrupted
+trap "cleanup_exit" 0 # normal exit
+trap "exit 255" HUP INT QUIT ABRT TERM
+
+HGTMP=$(mktemp -d ${TMPDIR-/tmp}/hgeditor.XXXXXX)
+[ x$HGTMP != x -a -d $HGTMP ] || {
+  echo "Could not create temporary directory! Exiting." 1>&2
+  exit 1
+}
+
+(
+    grep '^HG: changed' "$1" | cut -b 13- | while read changed; do
+        "$HG" diff "$changed" >> "$HGTMP/diff"
+    done
+)
+
+cat "$1" > "$HGTMP/msg"
+
+MD5=$(which md5sum 2>/dev/null) || \
+    MD5=$(which md5 2>/dev/null)
+[ -x "${MD5}" ] && CHECKSUM=`${MD5} "$HGTMP/msg"`
+if [ -s "$HGTMP/diff" ]; then
+    vim "+e $HGTMP/diff" '+set buftype=help filetype=diff' "+split $HGTMP/msg" "+wincmd r" "+resize 10" || exit $?
+else
+    vim "$HGTMP/msg" || exit $?
+fi
+[ -x "${MD5}" ] && (echo "$CHECKSUM" | ${MD5} -c >/dev/null 2>&1 && exit 13)
+
+mv "$HGTMP/msg" "$1"
+
+exit $?