Patchwork [1,of,3] template: add ifcontains template function

login
register
mail settings
Submitter Durham Goode
Date Feb. 13, 2014, 1:24 a.m.
Message ID <6c4d00a49f4ce956b8aa.1392254647@dev010.prn1.facebook.com>
Download mbox | patch
Permalink /patch/3631/
State Superseded
Commit 1e43f15a647f6acda968fcfe0dad6cca46580f41
Headers show

Comments

Durham Goode - Feb. 13, 2014, 1:24 a.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1392181800 28800
#      Tue Feb 11 21:10:00 2014 -0800
# Node ID 6c4d00a49f4ce956b8aa60b1352739be3492af78
# Parent  a2c08adbb86ed8e65897ce35ec97ee947f26d2dd
template: add ifcontains template function

Adds a template function with the signature 'ifcontains(item, set, then[,
else])'.  It can be used to do things like '{ifcontains('.hgignore',
file_mods, label(...), ...)}' to color commits that edit the .hgignore file.
A future patch will add the revset() function which will combine with
ifcontains to allow us to color commits if they are in the revset.

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -301,6 +301,19 @@ 
     elif len(args) == 3:
         yield _evalifliteral(args[2], context, mapping)
 
+def ifcontains(context, mapping, args):
+    if not (3 <= len(args) <= 4):
+        # i18n: "ifcontains" is a keyword
+        raise error.ParseError(_("ifcontains expects three or four arguments"))
+
+    item = stringify(args[0][0](context, mapping, args[0][1]))
+    items = args[1][0](context, mapping, args[1][1])
+
+    if item in items:
+        yield _evalifliteral(args[2], context, mapping)
+    elif len(args) == 4:
+        yield _evalifliteral(args[3], context, mapping)
+
 def ifeq(context, mapping, args):
     if not (3 <= len(args) <= 4):
         # i18n: "ifeq" is a keyword
@@ -436,6 +449,7 @@ 
     "fill": fill,
     "get": get,
     "if": if_,
+    "ifcontains": ifcontains,
     "ifeq": ifeq,
     "join": join,
     "label": label,
diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -1651,3 +1651,9 @@ 
   $ hg log --template '{pad(rev, 20, "-", False)} {author|user}\n'
   1------------------- test
   0------------------- test
+
+Test ifcontains function
+
+  $ hg log --template '{rev} {ifcontains("a", file_adds, "added a", "did not add a")}\n'
+  1 did not add a
+  0 added a