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

revset: use phasecache.getrevset...

revset: use phasecache.getrevset This is part of a refactoring that moves some phase query optimization from revset.py to phases.py. See the previous patch for motivation. This patch changes revset code to use phasecache.getrevset so it no longer accesses the private field: _phasecache._phasesets directly. For performance impact, this patch was tested using the following query, on my hg-committed repo: for i in 'public()' 'not public()' 'draft()' 'not draft()'; do echo $i; hg perfrevset "$i"; hg perfrevset "$i" --hidden; done For the CPython implementation, most operations are unchanged (within +/- 1%), while "not public()" and "draft()" is noticeably faster on an unfiltered repo. It may be because the new code avoids a set copy if filteredrevs is empty. revset | public() | not public() | draft() | not draft() hidden | yes | no | yes | no | yes | no | yes | no ------------------------------------------------------------------ before | 19006 | 17352 | 239 | 286 | 180 | 228 | 7690 | 5745 after | 19137 | 17231 | 240 | 207 | 182 | 150 | 7687 | 5658 delta | | -38% | | -52% | (timed in microseconds) For the pure Python implementation, some operations are faster while "not draft()" is noticeably slower: revset | public() | not public() | draft() | not draft() hidden | yes | no | yes | no | yes | no | yes | no ------------------------------------------------------------------------ before | 18852 | 17183 | 17758 | 15921 | 17505 | 15973 | 41521 | 39822 after | 18924 | 17380 | 17558 | 14545 | 16727 | 13593 | 48356 | 43992 delta | | -9% | -5% | -15% | +16% | +10% That may be the different performance characters of generatorset vs. filteredset. The "not draft()" query could be optimized in this case where both "public" and "secret" are passed to "getrevsets" so it won't iterate the whole repo twice.

David Demelier - - Load All Authors

File last commit:

r30941:35402007 default


                r31017:17b5cda5

default

Download file

             scmposix.py
        
                    79 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / scmposix.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from __future__ import absolute_import

      import array

      import errno

      import fcntl

      import os

      import sys

      from . import (

          encoding,

          osutil,

          pycompat,

      )

      def _rcfiles(path):

          rcs = [os.path.join(path, 'hgrc')]

          rcdir = os.path.join(path, 'hgrc.d')

          try:

              rcs.extend([os.path.join(rcdir, f)

                          for f, kind in osutil.listdir(rcdir)

                          if f.endswith(".rc")])

          except OSError:

              pass

          return rcs

      def systemrcpath():

          path = []

          if pycompat.sysplatform == 'plan9':

              root = 'lib/mercurial'

          else:

              root = 'etc/mercurial'

          # old mod_python does not set sys.argv

          if len(getattr(sys, 'argv', [])) > 0:

              p = os.path.dirname(os.path.dirname(pycompat.sysargv[0]))

              if p != '/':

                  path.extend(_rcfiles(os.path.join(p, root)))

          path.extend(_rcfiles('/' + root))

          return path

      def userrcpath():

          if pycompat.sysplatform == 'plan9':

              return [encoding.environ['home'] + '/lib/hgrc']

          elif pycompat.sysplatform == 'darwin':

              return [os.path.expanduser('~/.hgrc')]

          else:

              confighome = encoding.environ.get('XDG_CONFIG_HOME')

              if confighome is None or not os.path.isabs(confighome):

                  confighome = os.path.expanduser('~/.config')

              return [os.path.expanduser('~/.hgrc'),

                      os.path.join(confighome, 'hg', 'hgrc')]

      def termsize(ui):

          try:

              import termios

              TIOCGWINSZ = termios.TIOCGWINSZ  # unavailable on IRIX (issue3449)

          except (AttributeError, ImportError):

              return 80, 24

          for dev in (ui.ferr, ui.fout, ui.fin):

              try:

                  try:

                      fd = dev.fileno()

                  except AttributeError:

                      continue

                  if not os.isatty(fd):

                      continue

                  arri = fcntl.ioctl(fd, TIOCGWINSZ, '\0' * 8)

                  height, width = array.array('h', arri)[:2]

                  if width > 0 and height > 0:

                      return width, height

              except ValueError:

                  pass

              except IOError as e:

                  if e[0] == errno.EINVAL:

                      pass

                  else:

                      raise

          return 80, 24

	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

				from __future__ import absolute_import

				import array
				import errno
				import fcntl
				import os
				import sys

				from . import (
				encoding,
				osutil,
				pycompat,
				)

				def _rcfiles(path):
				rcs = [os.path.join(path, 'hgrc')]
				rcdir = os.path.join(path, 'hgrc.d')
				try:
				rcs.extend([os.path.join(rcdir, f)
				for f, kind in osutil.listdir(rcdir)
				if f.endswith(".rc")])
				except OSError:
				pass
				return rcs

				def systemrcpath():
				path = []
				if pycompat.sysplatform == 'plan9':
				root = 'lib/mercurial'
				else:
				root = 'etc/mercurial'
				# old mod_python does not set sys.argv
				if len(getattr(sys, 'argv', [])) > 0:
				p = os.path.dirname(os.path.dirname(pycompat.sysargv[0]))
				if p != '/':
				path.extend(_rcfiles(os.path.join(p, root)))
				path.extend(_rcfiles('/' + root))
				return path

				def userrcpath():
				if pycompat.sysplatform == 'plan9':
				return [encoding.environ['home'] + '/lib/hgrc']
				elif pycompat.sysplatform == 'darwin':
				return [os.path.expanduser('~/.hgrc')]
				else:
				confighome = encoding.environ.get('XDG_CONFIG_HOME')
				if confighome is None or not os.path.isabs(confighome):
				confighome = os.path.expanduser('~/.config')

				return [os.path.expanduser('~/.hgrc'),
				os.path.join(confighome, 'hg', 'hgrc')]

				def termsize(ui):
				try:
				import termios
				TIOCGWINSZ = termios.TIOCGWINSZ # unavailable on IRIX (issue3449)
				except (AttributeError, ImportError):
				return 80, 24

				for dev in (ui.ferr, ui.fout, ui.fin):
				try:
				try:
				fd = dev.fileno()
				except AttributeError:
				continue
				if not os.isatty(fd):
				continue
				arri = fcntl.ioctl(fd, TIOCGWINSZ, '\0' * 8)
				height, width = array.array('h', arri)[:2]
				if width > 0 and height > 0:
				return width, height
				except ValueError:
				pass
				except IOError as e:
				if e[0] == errno.EINVAL:
				pass
				else:
				raise
				return 80, 24