168328ff4a51

Clean up nlog and add parents to it
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Sun, 20 Nov 2016 11:52:33 +0000
parents 4d95cb18a3b4
children a6371635b645
branches/tags (none)
files map-cmdline.nlog

Changes

--- a/map-cmdline.nlog	Sat Feb 04 14:20:54 2012 -0500
+++ b/map-cmdline.nlog	Sun Nov 20 11:52:33 2016 +0000
@@ -1,6 +1,8 @@
-changeset = 'changeset: \033[0;31m[{phase}]\033[0m \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{bookmarks}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\nsummary:   {desc|firstline|strip}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+changeset         = 'changeset: {cset_info}\nparent(s): {parent_info}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\nsummary:   {desc|firstline|strip}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+changeset_verbose = 'changeset: {cset_info}\nparent(s): {parent_info}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\n\n{desc}\n\n{file_mods}{file_adds}{file_dels}\n\n'
 
-changeset_verbose = 'changeset: \033[0;31m[{phase}]\033[0m \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{bookmarks}{tags}\nauthor:    {author}\ndate:      {date|rfc822date} ({date|age})\n\n{desc}\n\n{file_mods}{file_adds}{file_dels}\n\n'
+cset_info = '\033[0;31m[{phase}]\033[0m \033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m{branches}{bookmarks}{tags}'
+parent_info = '\033[0;33m{ifeq(p1rev, -1, '', '{p1rev}:{p1node|short}')}{ifeq(p2rev, -1, '', ' {p2rev}:{p2node|short}')}\033[0m'
 
 start_file_adds = ''
 file_add = '\033[0;32mA {file_add}\033[0m\n'