# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1318701163 18000
# Node ID bd5103819c2e10882e12993003ae54364d2829bf
# Parent  3bfdfefea2fc3a8d1e7cd35ec7905cb6cc06fb63
revset: fix %r handling in formatspec

diff -r 3bfdfefea2fc -r bd5103819c2e mercurial/revset.py
--- a/mercurial/revset.py	Sat Oct 15 19:07:51 2011 +0200
+++ b/mercurial/revset.py	Sat Oct 15 12:52:43 2011 -0500
@@ -1064,8 +1064,8 @@
 
     Prefixing the type with 'l' specifies a parenthesized list of that type.
 
-    >>> formatspec('%d:: and %lr', 10, ("this()", "that()"))
-    '10:: and ((this()) or (that()))'
+    >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()"))
+    '(10 or 11):: and ((this()) or (that()))'
     >>> formatspec('%d:: and not %d::', 10, 20)
     '10:: and not 20::'
     >>> formatspec('keyword(%s)', 'foo\\xe9')
@@ -1104,7 +1104,7 @@
             d = expr[pos]
             if d == '%':
                 ret += d
-            elif d in 'dsnb':
+            elif d in 'dsnbr':
                 ret += argtype(d, args[arg])
                 arg += 1
             elif d == 'l':