--- a/mercurial/match.py	Fri May 19 11:50:01 2017 -0700
+++ b/mercurial/match.py	Sat May 20 23:49:14 2017 -0700
@@ -377,10 +377,11 @@
         return set(util.dirs(self._fileset)) | {'.'}
 
     def visitdir(self, dir):
+        if self.always():
+            return 'all'
         if self.prefix() and dir in self._fileset:
             return 'all'
-        return (not self._fileset or
-                '.' in self._fileset or
+        return ('.' in self._fileset or
                 dir in self._fileset or
                 dir in self._dirs or
                 any(parentdir in self._fileset