# HG changeset patch # User Yuya Nishihara # Date 1529136005 -32400 # Node ID 8783f128048e0b669c67d894904d542ca3118be7 # Parent 5cb39a368c803683fd8bc944480486a618ab785a fileset: raise ProgrammingError for bad existing() calls And glob out Py2/3 difference. diff -r 5cb39a368c80 -r 8783f128048e mercurial/fileset.py --- 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]) diff -r 5cb39a368c80 -r 8783f128048e tests/test-fileset.t --- 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(...)' ================