Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 4001:dda03b2d9ef1
symlinks: don't complain about symlinks
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 Dec 2006 20:04:31 -0600 |
parents | 6b4127c7d52a |
children | e6d26e71f049 |
comparison
equal
deleted
inserted
replaced
4000:3297aa945cf2 | 4001:dda03b2d9ef1 |
---|---|
335 break | 335 break |
336 bs += 1 | 336 bs += 1 |
337 return ret | 337 return ret |
338 | 338 |
339 def supported_type(self, f, st, verbose=False): | 339 def supported_type(self, f, st, verbose=False): |
340 if stat.S_ISREG(st.st_mode): | 340 if stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode): |
341 return True | 341 return True |
342 if verbose: | 342 if verbose: |
343 kind = 'unknown' | 343 kind = 'unknown' |
344 if stat.S_ISCHR(st.st_mode): kind = _('character device') | 344 if stat.S_ISCHR(st.st_mode): kind = _('character device') |
345 elif stat.S_ISBLK(st.st_mode): kind = _('block device') | 345 elif stat.S_ISBLK(st.st_mode): kind = _('block device') |
346 elif stat.S_ISFIFO(st.st_mode): kind = _('fifo') | 346 elif stat.S_ISFIFO(st.st_mode): kind = _('fifo') |
347 elif stat.S_ISLNK(st.st_mode): kind = _('symbolic link') | |
348 elif stat.S_ISSOCK(st.st_mode): kind = _('socket') | 347 elif stat.S_ISSOCK(st.st_mode): kind = _('socket') |
349 elif stat.S_ISDIR(st.st_mode): kind = _('directory') | 348 elif stat.S_ISDIR(st.st_mode): kind = _('directory') |
350 self.ui.warn(_('%s: unsupported file type (type is %s)\n') % ( | 349 self.ui.warn(_('%s: unsupported file type (type is %s)\n') % ( |
351 util.pathto(self.getcwd(), f), | 350 util.pathto(self.getcwd(), f), |
352 kind)) | 351 kind)) |