upstream/mercurial-mirror Files · mercurial/osutil.py

addremove: correctly handle intermediate symlinks...

addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).

Bryan O'Sullivan - - Load All Authors

File last commit:

r5396:5105b119 default


                r6651:7f0dd352

default

Download file

             osutil.py
        
                    37 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / osutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import os, stat

      def _mode_to_kind(mode):

          if stat.S_ISREG(mode): return stat.S_IFREG

          if stat.S_ISDIR(mode): return stat.S_IFDIR

          if stat.S_ISLNK(mode): return stat.S_IFLNK

          if stat.S_ISBLK(mode): return stat.S_IFBLK

          if stat.S_ISCHR(mode): return stat.S_IFCHR

          if stat.S_ISFIFO(mode): return stat.S_IFIFO

          if stat.S_ISSOCK(mode): return stat.S_IFSOCK

          return mode

      def listdir(path, stat=False):

          '''listdir(path, stat=False) -> list_of_tuples

          Return a sorted list containing information about the entries

          in the directory.

          If stat is True, each element is a 3-tuple:

            (name, type, stat object)

          Otherwise, each element is a 2-tuple:

            (name, type)

          '''

          result = []

          prefix = path + os.sep

          names = os.listdir(path)

          names.sort()

          for fn in names:

              st = os.lstat(prefix + fn)

              if stat:

                  result.append((fn, _mode_to_kind(st.st_mode), st))

              else:

                  result.append((fn, _mode_to_kind(st.st_mode)))

          return result

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				import os, stat

				def _mode_to_kind(mode):
				if stat.S_ISREG(mode): return stat.S_IFREG
				if stat.S_ISDIR(mode): return stat.S_IFDIR
				if stat.S_ISLNK(mode): return stat.S_IFLNK
				if stat.S_ISBLK(mode): return stat.S_IFBLK
				if stat.S_ISCHR(mode): return stat.S_IFCHR
				if stat.S_ISFIFO(mode): return stat.S_IFIFO
				if stat.S_ISSOCK(mode): return stat.S_IFSOCK
				return mode

				def listdir(path, stat=False):
				'''listdir(path, stat=False) -> list_of_tuples

				Return a sorted list containing information about the entries
				in the directory.

				If stat is True, each element is a 3-tuple:

				(name, type, stat object)

				Otherwise, each element is a 2-tuple:

				(name, type)
				'''
				result = []
				prefix = path + os.sep
				names = os.listdir(path)
				names.sort()
				for fn in names:
				st = os.lstat(prefix + fn)
				if stat:
				result.append((fn, _mode_to_kind(st.st_mode), st))
				else:
				result.append((fn, _mode_to_kind(st.st_mode)))
				return result