Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/fileset.py @ 17367:ce625185cfd9 stable
fileset: matchctx.existing() must consider ignored files
When running:
$ hg debugfileset 'binary() and ignored()'
getfileset() was correctly retrieving ignored files but
matchctx.existing() was not taking them in account. Just add them along
with unknown files.
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Wed, 15 Aug 2012 22:29:32 +0200 |
| parents | 04c65cb59467 |
| children | 01cc267fc105 |
comparison
equal
deleted
inserted
replaced
| 17366:04c65cb59467 | 17367:ce625185cfd9 |
|---|---|
| 430 def filter(self, files): | 430 def filter(self, files): |
| 431 return [f for f in files if f in self.subset] | 431 return [f for f in files if f in self.subset] |
| 432 def existing(self): | 432 def existing(self): |
| 433 if self._status is not None: | 433 if self._status is not None: |
| 434 removed = set(self._status[3]) | 434 removed = set(self._status[3]) |
| 435 unknown = set(self._status[4]) | 435 unknown = set(self._status[4] + self._status[5]) |
| 436 else: | 436 else: |
| 437 removed = set() | 437 removed = set() |
| 438 unknown = set() | 438 unknown = set() |
| 439 return (f for f in self.subset | 439 return (f for f in self.subset |
| 440 if (f in self.ctx and f not in removed) or f in unknown) | 440 if (f in self.ctx and f not in removed) or f in unknown) |