equal
deleted
inserted
replaced
291 try: |
291 try: |
292 includepats = readpatternfile(pat, self._warn) |
292 includepats = readpatternfile(pat, self._warn) |
293 for k, p, source in self._normalize(includepats, default, |
293 for k, p, source in self._normalize(includepats, default, |
294 root, cwd, auditor): |
294 root, cwd, auditor): |
295 kindpats.append((k, p, source or pat)) |
295 kindpats.append((k, p, source or pat)) |
296 except util.Abort, inst: |
296 except util.Abort as inst: |
297 raise util.Abort('%s: %s' % (pat, inst[0])) |
297 raise util.Abort('%s: %s' % (pat, inst[0])) |
298 except IOError, inst: |
298 except IOError as inst: |
299 if self._warn: |
299 if self._warn: |
300 self._warn(_("skipping unreadable pattern file " |
300 self._warn(_("skipping unreadable pattern file " |
301 "'%s': %s\n") % (pat, inst.strerror)) |
301 "'%s': %s\n") % (pat, inst.strerror)) |
302 continue |
302 continue |
303 # else: re or relre - which cannot be normalized |
303 # else: re or relre - which cannot be normalized |