changeset 301:92f460133b0c

Use Steve Losh's templates from some correct place. Add Jordi's aliases.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 22 May 2015 15:20:20 -0700
parents 65165c2de85e
children cd3246751ccf
files hgrc/hgrc hgrc/wip.style
diffstat 2 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgrc/hgrc	Fri May 22 15:19:32 2015 -0700
+++ b/hgrc/hgrc	Fri May 22 15:20:20 2015 -0700
@@ -24,10 +24,15 @@
 parentrevspec =
 
 [alias]
-slog = log --limit 10 --style=../lib/hg/mercurial-cli-templates/map-cmdline.slog
-nlog = log --limit 10 --style=../lib/hg/mercurial-cli-templates/map-cmdline.nlog
-sglog = glog --limit 10 --style=../lib/hg/mercurial-cli-templates/map-cmdline.sglog
+dlog = log --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.dlog
+slog = log --limit 10 --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.slog
+nlog = log --limit 10 --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.nlog
+sglog = glog --limit 10 --style=$DOTFILESPATH/lib/hg/mercurial-cli-templates/map-cmdline.sglog
 clog = glog --limit 10 --template "{rev} {branches} {bookmarks} {tags}    {node|short}    {date|shortdate}    {author|user}\n{desc}\n\n"
+wip = glog --style=$DOTFILESPATH/hgrc/wip.style --rev wip
+
+[revsetalias]
+wip = (parents(not public()) or not public() or . or head()) and (not obsolete() or unstable()^ and not closed())
 
 [progress]
 delay = 1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgrc/wip.style	Fri May 22 15:20:20 2015 -0700
@@ -0,0 +1,15 @@
+wbrch = '{label("log.branch",
+                 ifeq(branch, "default",
+                      "",
+                      branch))}'
+wcset = '{label("changeset.{phase}",
+                rev)}'
+wuser = '{label("grep.user",
+              author|user)}'
+wtags = '{label("log.tag",
+              if(tags," {tags}"))}'
+wbook = '{label("log.bookmark",
+              if(bookmarks," {bookmarks}"))}'
+wdesc = '{label(ifcontains(rev, revset('parents()'), 'desc.here'),
+              desc|firstline)}'
+changeset = '{wbrch} {wcset} {wuser} {wtags} {wbook}\n{wdesc}'