Mercurial > hg
comparison mercurial/store.py @ 40584:a694a7159125
store: pass in decoded filename to narrow matcher
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 10 Nov 2018 11:52:32 +0900 |
| parents | 9aeb9e2d28a7 |
| children | 66adfd58cb77 |
comparison
equal
deleted
inserted
replaced
| 40583:186921bc8e66 | 40584:a694a7159125 |
|---|---|
| 425 self.vfs = vfsmod.filtervfs(vfs, encodefilename) | 425 self.vfs = vfsmod.filtervfs(vfs, encodefilename) |
| 426 self.opener = self.vfs | 426 self.opener = self.vfs |
| 427 | 427 |
| 428 def datafiles(self, matcher=None): | 428 def datafiles(self, matcher=None): |
| 429 for a, b, size in super(encodedstore, self).datafiles(): | 429 for a, b, size in super(encodedstore, self).datafiles(): |
| 430 if not _matchtrackedpath(a, matcher): | |
| 431 continue | |
| 432 try: | 430 try: |
| 433 a = decodefilename(a) | 431 a = decodefilename(a) |
| 434 except KeyError: | 432 except KeyError: |
| 435 a = None | 433 a = None |
| 434 if a is not None and not _matchtrackedpath(a, matcher): | |
| 435 continue | |
| 436 yield a, b, size | 436 yield a, b, size |
| 437 | 437 |
| 438 def join(self, f): | 438 def join(self, f): |
| 439 return self.path + '/' + encodefilename(f) | 439 return self.path + '/' + encodefilename(f) |
| 440 | 440 |