Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fileset: raise ProgrammingError for bad existing() calls
authorYuya Nishihara <yuya@tcha.org>
Sat, 16 Jun 2018 17:00:05 +0900
changeset 38335 8783f128048e
parent 38334 5cb39a368c80
child 38336 62376d7b8859
fileset: raise ProgrammingError for bad existing() calls And glob out Py2/3 difference.
mercurial/fileset.py file | annotate | diff | comparison | revisions
tests/test-fileset.t file | annotate | diff | comparison | revisions 
--- a/mercurial/fileset.py	Sat Jun 16 16:56:38 2018 +0900
+++ b/mercurial/fileset.py	Sat Jun 16 17:00:05 2018 +0900
@@ -566,7 +566,8 @@
     def filter(self, files):
         return [f for f in files if f in self.subset]
     def existing(self):
-        assert self._existingenabled, 'unexpected existing() invocation'
+        if not self._existingenabled:
+            raise error.ProgrammingError('unexpected existing() invocation')
         if self._status is not None:
             removed = set(self._status[3])
             unknown = set(self._status[4] + self._status[5])
--- a/tests/test-fileset.t	Sat Jun 16 16:56:38 2018 +0900
+++ b/tests/test-fileset.t	Sat Jun 16 17:00:05 2018 +0900
@@ -446,7 +446,7 @@
   > EOF
 
   $ fileset 'existingcaller()' 2>&1 | tail -1
-  AssertionError: unexpected existing() invocation
+  *ProgrammingError: *unexpected existing() invocation* (glob)
 
 Test 'revs(...)'
 ================
hg-stable