##// END OF EJS Templates
match: some minimal pycompat fixes guided by test-hgignore.t...
Augie Fackler -
r36590:9adfa487 default
parent child Browse files
Show More
@@ -16,6 +16,7 b' from . import ('
16 encoding,
16 encoding,
17 error,
17 error,
18 pathutil,
18 pathutil,
19 pycompat,
19 util,
20 util,
20 )
21 )
21
22
@@ -226,7 +227,7 b' def _donormalize(patterns, default, root'
226 except IOError as inst:
227 except IOError as inst:
227 if warn:
228 if warn:
228 warn(_("skipping unreadable pattern file '%s': %s\n") %
229 warn(_("skipping unreadable pattern file '%s': %s\n") %
229 (pat, inst.strerror))
230 (pat, util.forcebytestr(inst.strerror)))
230 continue
231 continue
231 # else: re or relre - which cannot be normalized
232 # else: re or relre - which cannot be normalized
232 kindpats.append((kind, pat, ''))
233 kindpats.append((kind, pat, ''))
@@ -428,7 +429,7 b' class includematcher(basematcher):'
428
429
429 @encoding.strmethod
430 @encoding.strmethod
430 def __repr__(self):
431 def __repr__(self):
431 return ('<includematcher includes=%r>' % self._pats)
432 return ('<includematcher includes=%r>' % pycompat.bytestr(self._pats))
432
433
433 class exactmatcher(basematcher):
434 class exactmatcher(basematcher):
434 '''Matches the input files exactly. They are interpreted as paths, not
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