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

httppeer: wrap HTTPResponse.read() globally...

httppeer: wrap HTTPResponse.read() globally There were a handful of places in the code where HTTPResponse.read() was called with no explicit error handling or with inconsistent error handling. In order to eliminate this class of bug, we globally swap out HTTPResponse.read() with a unified error handler. I initially attempted to fix all call sites. However, after going down that rabbit hole, I figured it was best to just change read() to do what we want. This appears to be a worthwhile change, as the tests demonstrate many of our uncaught exceptions go away. To better represent this class of failure, we introduce a new error type. The main benefit over IOError is it can hold a hint. I'm receptive to tweaking its name or inheritance.

Pulkit Goyal - - Load All Authors

File last commit:

r31339:7c09b071 default


                r32002:bf855efe

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(r'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(r'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