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

diff: do not concatenate immutable bytes while building a/b bodies (issue6445)...

diff: do not concatenate immutable bytes while building a/b bodies (issue6445) Use bytearray instead. I don't know what's changed since Python 2, but bytes concatenation is 100x slow on Python 3. % python2.7 -m timeit -s "s = b''" "for i in range(10000): s += b'line'" 1000 loops, best of 3: 321 usec per loop % python3.9 -m timeit -s "s = b''" "for i in range(10000): s += b'line'" 5 loops, best of 5: 39.2 msec per loop Benchmark using tailwind.css (measuring the fast path, a is empty): % HGRCPATH=/dev/null python2.7 ./hg log -R /tmp/issue6445 -p --time \ --color=always --config diff.word-diff=true >/dev/null (prev) time: real 1.580 secs (user 1.560+0.000 sys 0.020+0.000) (this) time: real 1.610 secs (user 1.570+0.000 sys 0.030+0.000) % HGRCPATH=/dev/null python3.9 ./hg log -R /tmp/issue6445 -p --time \ --color=always --config diff.word-diff=true >/dev/null (prev) time: real 114.500 secs (user 114.460+0.000 sys 0.030+0.000) (this) time: real 2.180 secs (user 2.140+0.000 sys 0.040+0.000) Benchmark using random tabular text data (not the fast path): % dd if=/dev/urandom bs=1k count=1000 | hexdump -v -e '16/1 "%3u," "\n"' > ttf % hg ci -ma % dd if=/dev/urandom bs=1k count=1000 | hexdump -v -e '16/1 "%3u," "\n"' > ttf % hg ci -mb % HGRCPATH=/dev/null python2.7 ./hg log -R /tmp/issue6445 -p --time \ --color=always --config diff.word-diff=true >/dev/null (prev) time: real 3.240 secs (user 3.040+0.000 sys 0.200+0.000 (this) time: real 3.230 secs (user 3.070+0.000 sys 0.160+0.000) % HGRCPATH=/dev/null python3.9 ./hg log -R /tmp/issue6445 -p --time \ --color=always --config diff.word-diff=true >/dev/null (prev) time: real 44.130 secs (user 43.850+0.000 sys 0.270+0.000) (this) time: real 4.170 secs (user 3.850+0.000 sys 0.310+0.000)

Martin von Zweigbergk - - Load All Authors

File last commit:

r46428:9ac96b9f default


                r46624:210f9b8d

stable

Download file

             scmwindows.py
        
                    81 lines
            
             | 2.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / scmwindows.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
scmwindows: use absolute_import

              r27481
            
      from __future__ import absolute_import

        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
      import os

        Gregory Szorc
    
scmwindows: use absolute_import

              r27481
            
      from . import (

        Pulkit Goyal
    
py3: replace os.environ with encoding.environ (part 4 of 5)

              r30637
            
          encoding,

        Pulkit Goyal
    
py3: replace os.pathsep with pycompat.ospathsep...

              r30612
            
          pycompat,

        Gregory Szorc
    
scmwindows: use absolute_import

              r27481
            
          util,

        Yuya Nishihara
    
scmutil: move util.termwidth()...

              r30309
            
          win32,

        Gregory Szorc
    
scmwindows: use absolute_import

              r27481
            
      )

        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
        Pulkit Goyal
    
py3: conditionalize _winreg import...

              r29760
            
      try:

        Matt Harbison
    
windows: suppress pytype warnings for Windows imports and functions...

              r44207
            
          import _winreg as winreg  # pytype: disable=import-error

        Augie Fackler
    
style: run a patched black on a subset of mercurial...

              r43345
            
        Pulkit Goyal
    
py3: conditionalize _winreg import...

              r29760
            
          winreg.CloseKey

      except ImportError:

        Matt Harbison
    
windows: suppress pytype warnings for Windows imports and functions...

              r44207
            
          # py2 only

          import winreg  # pytype: disable=import-error

        Pulkit Goyal
    
py3: conditionalize _winreg import...

              r29760
            
        Yuya Nishihara
    
pager: use less as a fallback on Unix...

              r32078
            
      # MS-DOS 'more' is the only pager available by default on Windows.

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
      fallbackpager = b'more'

        Yuya Nishihara
    
pager: use less as a fallback on Unix...

              r32078
            
        Augie Fackler
    
style: run a patched black on a subset of mercurial...

              r43345
            
        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
      def systemrcpath():

          '''return default os-specific hgrc search path'''

          rcpath = []

        Yuya Nishihara
    
rcutil: directly call win32.executablepath()...

              r37113
            
          filename = win32.executablepath()

        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
          # Use mercurial.ini found in directory with hg.exe

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
          progrc = os.path.join(os.path.dirname(filename), b'mercurial.ini')

        Mads Kiilerich
    
windows: read all global config files, not just the first (issue4491) (BC)...

              r26625
            
          rcpath.append(progrc)

        Matt Harbison
    
windows: factor the hgrc directory scan into a function...

              r44377
            
          def _processdir(progrcd):

              if os.path.isdir(progrcd):

                  for f, kind in util.listdir(progrcd):

                      if f.endswith(b'.rc'):

                          rcpath.append(os.path.join(progrcd, f))

        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
          # Use hgrc.d found in directory with hg.exe

        Matt Harbison
    
windows: factor the hgrc directory scan into a function...

              r44377
            
          _processdir(os.path.join(os.path.dirname(filename), b'hgrc.d'))

        Matt Harbison
    
windows: add a global equivalent to /etc/mercurial for *.rc processing...

              r44403
            
          # treat a PROGRAMDATA directory as equivalent to /etc/mercurial

          programdata = encoding.environ.get(b'PROGRAMDATA')

          if programdata:

              programdata = os.path.join(programdata, b'Mercurial')

              _processdir(os.path.join(programdata, b'hgrc.d'))

              ini = os.path.join(programdata, b'mercurial.ini')

              if os.path.isfile(ini):

                  rcpath.append(ini)

              ini = os.path.join(programdata, b'hgrc')

              if os.path.isfile(ini):

                  rcpath.append(ini)

        Matt Harbison
    
windows: clarify a comment about the hgrc search path...

              r44375
            
          # next look for a system rcpath in the registry

        Augie Fackler
    
style: run a patched black on a subset of mercurial...

              r43345
            
          value = util.lookupreg(

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
              b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE

        Augie Fackler
    
style: run a patched black on a subset of mercurial...

              r43345
            
          )

        Matt Harbison
    
windows: don't return early from building the hgrc search path...

              r44376
            
          if value and isinstance(value, bytes):

              value = util.localpath(value)

              for p in value.split(pycompat.ospathsep):

                  if p.lower().endswith(b'mercurial.ini'):

                      rcpath.append(p)

        Matt Harbison
    
windows: factor the hgrc directory scan into a function...

              r44377
            
                  else:

                      _processdir(p)

        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
          return rcpath

        Augie Fackler
    
style: run a patched black on a subset of mercurial...

              r43345
            
        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
      def userrcpath():

          '''return os-specific hgrc search path to the user dir'''

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
          home = os.path.expanduser(b'~')

          path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')]

          userprofile = encoding.environ.get(b'USERPROFILE')

        Mads Kiilerich
    
config: don't read the same config file twice...

              r22583
            
          if userprofile and userprofile != home:

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
              path.append(os.path.join(userprofile, b'mercurial.ini'))

              path.append(os.path.join(userprofile, b'.hgrc'))

        Kevin Bullock
    
scmutil: split platform-specific bits into their own modules...

              r18690
            
          return path

        Yuya Nishihara
    
scmutil: move util.termwidth()...

              r30309
            
        Augie Fackler
    
style: run a patched black on a subset of mercurial...

              r43345
            
        Yuya Nishihara
    
scmutil: extend termwidth() to return terminal height, renamed to termsize()...

              r30314
            
      def termsize(ui):

          return win32.termsize()

	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

Gregory Szorc scmwindows: use absolute_import	r27481	from __future__ import absolute_import

Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690	import os
Gregory Szorc scmwindows: use absolute_import	r27481
		from . import (
Pulkit Goyal py3: replace os.environ with encoding.environ (part 4 of 5)	r30637	encoding,
Pulkit Goyal py3: replace os.pathsep with pycompat.ospathsep...	r30612	pycompat,
Gregory Szorc scmwindows: use absolute_import	r27481	util,
Yuya Nishihara scmutil: move util.termwidth()...	r30309	win32,
Gregory Szorc scmwindows: use absolute_import	r27481	)
Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690
Pulkit Goyal py3: conditionalize _winreg import...	r29760	try:
Matt Harbison windows: suppress pytype warnings for Windows imports and functions...	r44207	import _winreg as winreg # pytype: disable=import-error
Augie Fackler style: run a patched black on a subset of mercurial...	r43345
Pulkit Goyal py3: conditionalize _winreg import...	r29760	winreg.CloseKey
		except ImportError:
Matt Harbison windows: suppress pytype warnings for Windows imports and functions...	r44207	# py2 only
		import winreg # pytype: disable=import-error
Pulkit Goyal py3: conditionalize _winreg import...	r29760
Yuya Nishihara pager: use less as a fallback on Unix...	r32078	# MS-DOS 'more' is the only pager available by default on Windows.
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	fallbackpager = b'more'
Yuya Nishihara pager: use less as a fallback on Unix...	r32078
Augie Fackler style: run a patched black on a subset of mercurial...	r43345
Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690	def systemrcpath():
		'''return default os-specific hgrc search path'''
		rcpath = []
Yuya Nishihara rcutil: directly call win32.executablepath()...	r37113	filename = win32.executablepath()
Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690	# Use mercurial.ini found in directory with hg.exe
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	progrc = os.path.join(os.path.dirname(filename), b'mercurial.ini')
Mads Kiilerich windows: read all global config files, not just the first (issue4491) (BC)...	r26625	rcpath.append(progrc)
Matt Harbison windows: factor the hgrc directory scan into a function...	r44377
		def _processdir(progrcd):
		if os.path.isdir(progrcd):
		for f, kind in util.listdir(progrcd):
		if f.endswith(b'.rc'):
		rcpath.append(os.path.join(progrcd, f))

Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690	# Use hgrc.d found in directory with hg.exe
Matt Harbison windows: factor the hgrc directory scan into a function...	r44377	_processdir(os.path.join(os.path.dirname(filename), b'hgrc.d'))

Matt Harbison windows: add a global equivalent to /etc/mercurial for *.rc processing...	r44403	# treat a PROGRAMDATA directory as equivalent to /etc/mercurial
		programdata = encoding.environ.get(b'PROGRAMDATA')
		if programdata:
		programdata = os.path.join(programdata, b'Mercurial')
		_processdir(os.path.join(programdata, b'hgrc.d'))

		ini = os.path.join(programdata, b'mercurial.ini')
		if os.path.isfile(ini):
		rcpath.append(ini)

		ini = os.path.join(programdata, b'hgrc')
		if os.path.isfile(ini):
		rcpath.append(ini)

Matt Harbison windows: clarify a comment about the hgrc search path...	r44375	# next look for a system rcpath in the registry
Augie Fackler style: run a patched black on a subset of mercurial...	r43345	value = util.lookupreg(
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE
Augie Fackler style: run a patched black on a subset of mercurial...	r43345	)
Matt Harbison windows: don't return early from building the hgrc search path...	r44376	if value and isinstance(value, bytes):
		value = util.localpath(value)
		for p in value.split(pycompat.ospathsep):
		if p.lower().endswith(b'mercurial.ini'):
		rcpath.append(p)
Matt Harbison windows: factor the hgrc directory scan into a function...	r44377	else:
		_processdir(p)
Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690	return rcpath

Augie Fackler style: run a patched black on a subset of mercurial...	r43345
Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690	def userrcpath():
		'''return os-specific hgrc search path to the user dir'''
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	home = os.path.expanduser(b'~')
		path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')]
		userprofile = encoding.environ.get(b'USERPROFILE')
Mads Kiilerich config: don't read the same config file twice...	r22583	if userprofile and userprofile != home:
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	path.append(os.path.join(userprofile, b'mercurial.ini'))
		path.append(os.path.join(userprofile, b'.hgrc'))
Kevin Bullock scmutil: split platform-specific bits into their own modules...	r18690	return path
Yuya Nishihara scmutil: move util.termwidth()...	r30309
Augie Fackler style: run a patched black on a subset of mercurial...	r43345
Yuya Nishihara scmutil: extend termwidth() to return terminal height, renamed to termsize()...	r30314	def termsize(ui):
		return win32.termsize()