changeset 38958:b9f94d67ea73

match: add missing "return set()", add FIXME to test to doc a bug These were both brought up during the codereview of D4130. Differential Revision: https://phab.mercurial-scm.org/D4160
author Kyle Lippincott <spectral@google.com>
date Wed, 08 Aug 2018 17:03:05 -0700
parents f356be1a7ba3
children 0d032756e9bf
files mercurial/match.py tests/test-match.py
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/match.py	Wed Aug 08 16:53:17 2018 -0700
+++ b/mercurial/match.py	Wed Aug 08 17:03:05 2018 -0700
@@ -910,6 +910,7 @@
             return self._matcher.visitchildrenset(dir[len(self._pathprefix):])
         if dir in self._pathdirs:
             return 'this'
+        return set()
 
     def isexact(self):
         return self._matcher.isexact()
--- a/tests/test-match.py	Wed Aug 08 16:53:17 2018 -0700
+++ b/tests/test-match.py	Wed Aug 08 17:03:05 2018 -0700
@@ -97,6 +97,8 @@
         self.assertEqual(m.visitchildrenset('.'), 'this')
         self.assertEqual(m.visitchildrenset('dir/subdir/x'), set())
         self.assertEqual(m.visitchildrenset('folder'), set())
+        # FIXME: These should probably be {'subdir'} and 'this', respectively,
+        # or at least 'this' and 'this'.
         self.assertEqual(m.visitchildrenset('dir'), set())
         self.assertEqual(m.visitchildrenset('dir/subdir'), set())