# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1263143994 18000
# Node ID 711219d15b394ff39dd40b9e6c3cde7bdeb586db
# Parent  47c783bc17f872b5ccecb7454ad3530a27587a5e
Rearrange some files, finish nlog.

diff -r 47c783bc17f8 -r 711219d15b39 .hgrc
--- a/.hgrc	Sun Jan 10 12:00:32 2010 -0500
+++ b/.hgrc	Sun Jan 10 12:19:54 2010 -0500
@@ -76,16 +76,12 @@
 rebase = --keepbranches
 addremove = --similarity 100
 
-
 [alias]
-fold = collapse
 nudge = push --rev .
 tmd = diff --no-color -U 10
 cm = commit -m
+st = status -C
 ? = 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
 
 slog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.slog
 . = slog -l15
@@ -94,3 +90,6 @@
 , = glog -l10 --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.sglog
 ,, = , -l100000000
 
+nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.nlog
+n = nlog -vr
+show = nlog -vpr
\ No newline at end of file
diff -r 47c783bc17f8 -r 711219d15b39 mercurial/cli-templates/map-cmdline.nlog
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/cli-templates/map-cmdline.nlog	Sun Jan 10 12:19:54 2010 -0500
@@ -0,0 +1,22 @@
+changeset = 'changeset: \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\nsummary:   {desc|firstline|strip}\n\n{file_adds}{file_dels}{file_mods}\n\n'
+
+changeset_verbose = 'changeset: \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\n\n{desc|fill76}\n\n{file_adds}{file_dels}{file_mods}\n\n'
+
+start_file_adds = ''
+file_add = '\033[0;32mA {file_add}\033[0m\n'
+end_file_adds = ''
+
+start_file_dels = ''
+file_del = '\033[0;31mR {file_del}\033[0m\n'
+end_file_dels = ''
+
+start_file_mods = ''
+file_mod = '\033[0;36mM {file_mod}\033[0m\n'
+end_file_mods = ''
+
+start_branches = ' '
+branch = '\033[0;35m{branch}\033[0m'
+
+start_tags = ' '
+tag = '\033[0;33m{tag}\033[0m, '
+last_tag = '\033[0;33m{tag}\033[0m'
\ No newline at end of file
diff -r 47c783bc17f8 -r 711219d15b39 mercurial/cli-templates/map-cmdline.show
--- a/mercurial/cli-templates/map-cmdline.show	Sun Jan 10 12:00:32 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-changeset = show.changeset.template
-
-start_file_adds = ''
-file_add = '\033[0;32mA {file_add}\033[0m\n'
-end_file_adds = ''
-
-start_file_dels = ''
-file_del = '\033[0;31mR {file_del}\033[0m\n'
-end_file_dels = ''
-
-start_file_mods = ''
-file_mod = '\033[0;36mM {file_mod}\033[0m\n'
-end_file_mods = ''
\ No newline at end of file
diff -r 47c783bc17f8 -r 711219d15b39 mercurial/cli-templates/show.changeset.template
--- a/mercurial/cli-templates/show.changeset.template	Sun Jan 10 12:00:32 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-changeset: {rev}:{node|short}
-author:    {author}
-date:      {date|rfc822date} ({date|age})
-summary:   {desc|firstline|strip}
-
-{file_adds}{file_dels}{file_mods}
-