[PATCH 5 of 5 v2] revset: add pattern matching to 'extra' revset expression

[Simon King]

# HG changeset patch
# User Simon King <simon at simonking.org.uk>
# Date 1338074967 -3600
# Node ID d5cf808c93b662349222932dc9566fb8fd505fe1
# Parent  a67509964b62123b93218de9d79518e7880998a0
revset: add pattern matching to 'extra' revset expression

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -498,7 +498,12 @@
 def extra(repo, subset, x):
     """``extra(label, [value])``
     Changesets with the given label in the extra metadata, with the given
-    optional value."""
+    optional value.
+
+    If `value` starts with `re:`, the remainder of the value is treated as
+    a regular expression. To match a value that actually starts with `re:`,
+    use the prefix `literal:`.
+    """
 
     l = getargs(x, 1, 2, _('extra takes at least 1 and at most 2 arguments'))
     label = getstring(l[0], _('first argument to extra must be a string'))
@@ -506,10 +511,11 @@
 
     if len(l) > 1:
         value = getstring(l[1], _('second argument to extra must be a string'))
+        kind, value, matcher = _stringmatcher(value)
 
     def _matchvalue(r):
         extra = repo[r].extra()
-        return label in extra and (value is None or value == extra[label])
+        return label in extra and (value is None or matcher(extra[label]))
 
     return [r for r in subset if _matchvalue(r)]
 
diff --git a/tests/test-revset.t b/tests/test-revset.t
--- a/tests/test-revset.t
+++ b/tests/test-revset.t
@@ -38,6 +38,9 @@
   0
   1
   2
+  $ hg log -r "extra('branch', 're:a')" --template '{rev} {branch}\n'
+  0 a
+  2 a-b-c-
 
   $ hg co 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved