symlinks: don't complain about symlinks
authorMatt Mackall <mpm@selenic.com>
Fri, 29 Dec 2006 20:04:31 -0600
changeset 4001 dda03b2d9ef1
parent 4000 3297aa945cf2
child 4002 d7b9ec589546
symlinks: don't complain about symlinks
mercurial/dirstate.py
--- a/mercurial/dirstate.py	Fri Dec 29 20:04:31 2006 -0600
+++ b/mercurial/dirstate.py	Fri Dec 29 20:04:31 2006 -0600
@@ -337,14 +337,13 @@
         return ret
 
     def supported_type(self, f, st, verbose=False):
-        if stat.S_ISREG(st.st_mode):
+        if stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode):
             return True
         if verbose:
             kind = 'unknown'
             if stat.S_ISCHR(st.st_mode): kind = _('character device')
             elif stat.S_ISBLK(st.st_mode): kind = _('block device')
             elif stat.S_ISFIFO(st.st_mode): kind = _('fifo')
-            elif stat.S_ISLNK(st.st_mode): kind = _('symbolic link')
             elif stat.S_ISSOCK(st.st_mode): kind = _('socket')
             elif stat.S_ISDIR(st.st_mode): kind = _('directory')
             self.ui.warn(_('%s: unsupported file type (type is %s)\n') % (