# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 2014-02-18 22:48:56
# Node ID 01a75c9d5b5ecdc6adb827ca744b0c121dee5872
# Parent  1a9ebc83a74c7e7872006491bd984997a9348031

help: add ifcontains, revset, and shortest to template help

Adds help information to the template help doc. Mentions ifcontains, revset,
shortest, and current in bookmarks.

diff --git a/mercurial/help/templates.txt b/mercurial/help/templates.txt
--- a/mercurial/help/templates.txt
+++ b/mercurial/help/templates.txt
@@ -52,14 +52,20 @@ In addition to filters, there are some b
 
 - if(expr, then[, else])
 
+- ifcontains(expr, expr, then[, else])
+
 - ifeq(expr, expr, then[, else])
 
 - join(list, sep)
 
 - label(label, expr)
 
+- revset(query[, formatargs])
+
 - rstdoc(text, style)
 
+- shortest(node)
+
 - strip(text[, chars])
 
 - sub(pat, repl, expr)
@@ -106,3 +112,11 @@ Some sample command line templates:
 - Display the contents of the 'extra' field, one per line::
 
    $ hg log -r 0 --template "{join(extras, '\n')}\n"
+
+- Mark the current bookmark with '*'::
+
+   $ hg log --template "{bookmarks % '{bookmark}{ifeq(bookmark, current, \"*\")} '}\n"
+
+- Mark the working copy parent with '@'::
+
+   $ hg log --template "{ifcontains(rev, revset('.'), '@')}\n"