Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 1527:c13fce7167c2
don't print anything about file of unsupported type unless
the file was specified on the command line
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 11 Nov 2005 15:33:08 -0800 |
parents | 755e7ac351ef |
children | a208e86bbc34 |
comparison
equal
deleted
inserted
replaced
1526:c230939283c3 | 1527:c13fce7167c2 |
---|---|
239 else: | 239 else: |
240 break | 240 break |
241 bs += 1 | 241 bs += 1 |
242 return ret | 242 return ret |
243 | 243 |
244 def supported_type(self, f, st, verbose=True): | 244 def supported_type(self, f, st, verbose=False): |
245 if stat.S_ISREG(st.st_mode): | 245 if stat.S_ISREG(st.st_mode): |
246 return True | 246 return True |
247 if verbose: | 247 if verbose: |
248 kind = 'unknown' | 248 kind = 'unknown' |
249 if stat.S_ISCHR(st.st_mode): kind = _('character device') | 249 if stat.S_ISCHR(st.st_mode): kind = _('character device') |
350 ff = util.normpath(ff) | 350 ff = util.normpath(ff) |
351 if seen(ff): | 351 if seen(ff): |
352 continue | 352 continue |
353 self.blockignore = True | 353 self.blockignore = True |
354 if statmatch(ff, st): | 354 if statmatch(ff, st): |
355 if self.supported_type(ff, st): | 355 if self.supported_type(ff, st, verbose=True): |
356 yield 'f', ff, st | 356 yield 'f', ff, st |
357 elif ff in dc: | 357 elif ff in dc: |
358 yield 'm', ff, st | 358 yield 'm', ff, st |
359 self.blockignore = False | 359 self.blockignore = False |
360 | 360 |