merge with stable

mercurial/match.py

@@ -233,6 +233,10 b' def _globre(pat):'
     [^/]*
     >>> print _globre(r'**')
     .*
+    >>> print _globre(r'**/a')
+    (?:.*/)?a
+    >>> print _globre(r'a/**/b')
+    a\/(?:.*/)?b
     >>> print _globre(r'[a*?!^][^b][!c]')
     [a*?!^][\^b][^c]
     >>> print _globre(r'{a,b}')
@@ -254,6 +258,10 b' def _globre(pat):'
         elif c == '*':
             if peek() == '*':
                 i += 1
+                if peek() == '/':
+                    i += 1
+                    res += '(?:.*/)?'
+                else:
                 res += '.*'
             else:
                 res += '[^/]*'

tests/test-hgignore.t

@@ -134,3 +134,17 b' Check patterns that match only the direc'
   ? a.c
   ? a.o
   ? syntax
+
+Check recursive glob pattern matches no directories (dir/**/c.o matches dir/c.o)
+
+  $ echo "syntax: glob" > .hgignore
+  $ echo "dir/**/c.o" >> .hgignore
+  $ touch dir/c.o
+  $ mkdir dir/subdir
+  $ touch dir/subdir/c.o
+  $ hg status
+  A dir/b.o
+  ? .hgignore
+  ? a.c
+  ? a.o
+  ? syntax