merge with stable
authorMatt Mackall <mpm@selenic.com>
Tue, 03 Feb 2015 17:54:01 -0600
changeset 24012 bc75f8750cde
parent 24011 d7d08337b3f6 (current diff)
parent 24008 873eb5db89c8 (diff)
child 24014 7d9367de2654
merge with stable
mercurial/revset.py
tests/test-revset.t
--- a/mercurial/revset.py	Tue Jan 27 17:24:12 2015 -0800
+++ b/mercurial/revset.py	Tue Feb 03 17:54:01 2015 -0600
@@ -1277,7 +1277,7 @@
     names = set()
     for ns in namespaces:
         for name in ns.listnames(repo):
-            names.update(ns.nodes(repo, name))
+            names.update(repo[n].rev() for n in ns.nodes(repo, name))
 
     names -= set([node.nullrev])
     return subset & names
--- a/tests/test-revset.t	Tue Jan 27 17:24:12 2015 -0800
+++ b/tests/test-revset.t	Tue Feb 03 17:54:01 2015 -0600
@@ -787,6 +787,12 @@
   $ log 'present(named("unknown"))'
   $ log 'present(named("re:unknown"))'
 
+  $ log 'tag()'
+  6
+  $ log 'named("tags")'
+  6
+  9
+
 issue2437
 
   $ log '3 and p1(5)'