Show More
@@ -16,6 +16,7 b' from . import (' | |||
|
16 | 16 | encoding, |
|
17 | 17 | error, |
|
18 | 18 | pathutil, |
|
19 | pycompat, | |
|
19 | 20 | util, |
|
20 | 21 | ) |
|
21 | 22 | |
@@ -226,7 +227,7 b' def _donormalize(patterns, default, root' | |||
|
226 | 227 | except IOError as inst: |
|
227 | 228 | if warn: |
|
228 | 229 | warn(_("skipping unreadable pattern file '%s': %s\n") % |
|
229 | (pat, inst.strerror)) | |
|
230 | (pat, util.forcebytestr(inst.strerror))) | |
|
230 | 231 | continue |
|
231 | 232 | # else: re or relre - which cannot be normalized |
|
232 | 233 | kindpats.append((kind, pat, '')) |
@@ -428,7 +429,7 b' class includematcher(basematcher):' | |||
|
428 | 429 | |
|
429 | 430 | @encoding.strmethod |
|
430 | 431 | def __repr__(self): |
|
431 | return ('<includematcher includes=%r>' % self._pats) | |
|
432 | return ('<includematcher includes=%r>' % pycompat.bytestr(self._pats)) | |
|
432 | 433 | |
|
433 | 434 | class exactmatcher(basematcher): |
|
434 | 435 | '''Matches the input files exactly. They are interpreted as paths, not |
General Comments 0
You need to be logged in to leave comments.
Login now