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

mq: Fix --qrefresh --short to work with --exclude and --include...

mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.

Benoit Boissinot - - Load All Authors

File last commit:

r7057:094af6ee default


                r7177:09ed32b7

default

Download file

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

      import os

      import stat as _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, skip=None):

          '''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 fn == skip and _stat.S_ISDIR(st.st_mode):

                  return []

              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
				import stat as _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, skip=None):
				'''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 fn == skip and _stat.S_ISDIR(st.st_mode):
				return []
				if stat:
				result.append((fn, _mode_to_kind(st.st_mode), st))
				else:
				result.append((fn, _mode_to_kind(st.st_mode)))
				return result