upstream/mercurial-mirror Files · mercurial/testing/revlog.py

statichttprepo: fix `httprangereader.read()` for py3...

statichttprepo: fix `httprangereader.read()` for py3 It looks like there were a bunch of problems, not all of them py3 related: 1) The signature of BinaryIO.read() is -1, not None 2) The `end` variable can't be bytes and interpolate into str with "%s" 3) The `end` variable can't be an int and interpolate into str with "%s" 4) The result slicing could be out of bounds if more is requested than returned I guess if somebody would have called `read(-1)` (either directly or because a wrapper defaults to that), it wouldn't have been handled correctly. The fact that it is a valid value meaning to read everything requires some additional changes later in the method around when it slices the byte string that was read, but that seems to have already been broken.

Matt Harbison - - Load All Authors

File last commit:

r52756:f4733654 default


                r52792:e26a0856

default

Download file

             revlog.py
        
                    64 lines
            
             | 2.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / testing / revlog.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Harbison
    
typing: add `from __future__ import annotations` to most files...

              r52756
            
      from __future__ import annotations

        marmoute
    
test: extract some generic data and utility from test-rust-ancestor.py...

              r44397
            
      import unittest

      # picked from test-parse-index2, copied rather than imported

      # so that it stays stable even if test-parse-index2 changes or disappears.

      data_non_inlined = (

          b'\x00\x00\x00\x01\x00\x00\x00\x00\x00\x01D\x19'

          b'\x00\x07e\x12\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff'

          b'\xff\xff\xff\xff\xd1\xf4\xbb\xb0\xbe\xfc\x13\xbd\x8c\xd3\x9d'

          b'\x0f\xcd\xd9;\x8c\x07\x8cJ/\x00\x00\x00\x00\x00\x00\x00\x00\x00'

          b'\x00\x00\x00\x00\x00\x00\x01D\x19\x00\x00\x00\x00\x00\xdf\x00'

          b'\x00\x01q\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\xff'

          b'\xff\xff\xff\xc1\x12\xb9\x04\x96\xa4Z1t\x91\xdfsJ\x90\xf0\x9bh'

          b'\x07l&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'

          b'\x00\x01D\xf8\x00\x00\x00\x00\x01\x1b\x00\x00\x01\xb8\x00\x00'

          b'\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\xff\xff\xff\xff\x02\n'

          b'\x0e\xc6&\xa1\x92\xae6\x0b\x02i\xfe-\xe5\xbao\x05\xd1\xe7\x00'

          b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01F'

          b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'

          b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'

          b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'

          b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'

      )

        Georges Racinet
    
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...

              r52132
            
      from ..revlogutils.constants import REVLOGV1

        marmoute
    
test: extract some generic data and utility from test-rust-ancestor.py...

              r44397
            
      try:

        Matt Harbison
    
typing: disable import error warnings that are already handled...

              r47543
            
          from ..cext import parsers as cparsers  # pytype: disable=import-error

        marmoute
    
test: extract some generic data and utility from test-rust-ancestor.py...

              r44397
            
      except ImportError:

          cparsers = None

        Georges Racinet
    
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...

              r52132
            
      try:

        Georges Racinet on incendie.racinet.fr
    
rust-index: renamed `MixedIndex` as `Index`...

              r52147
            
          from ..rustext.revlog import (  # pytype: disable=import-error

              Index as RustIndex,

          )

        Georges Racinet
    
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...

              r52132
            
      except ImportError:

        Georges Racinet on incendie.racinet.fr
    
rust-index: renamed `MixedIndex` as `Index`...

              r52147
            
          RustIndex = None

        Georges Racinet
    
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...

              r52132
            
        marmoute
    
test: extract some generic data and utility from test-rust-ancestor.py...

              r44397
            
      @unittest.skipIf(

          cparsers is None,

          'The C version of the "parsers" module is not available. It is needed for this test.',

      )

      class RevlogBasedTestBase(unittest.TestCase):

        Georges Racinet
    
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...

              r52132
            
          def parseindex(self, data=None):

              if data is None:

                  data = data_non_inlined

              return cparsers.parse_index2(data, False)[0]

        Georges Racinet on incendie.racinet.fr
    
rust-python-testing: separated base test classes...

              r52137
            
      @unittest.skipIf(

        Georges Racinet on incendie.racinet.fr
    
rust-index: renamed `MixedIndex` as `Index`...

              r52147
            
          RustIndex is None,

        Georges Racinet on incendie.racinet.fr
    
rust-python-testing: separated base test classes...

              r52137
            
          'The Rust index is not available. It is needed for this test.',

      )

      class RustRevlogBasedTestBase(unittest.TestCase):

        Georges Racinet
    
rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...

              r52132
            
          def parserustindex(self, data=None):

              if data is None:

                  data = data_non_inlined

        Georges Racinet on incendie.racinet.fr
    
rust-python-testing: separated base test classes...

              r52137
            
              # not inheriting RevlogBasedTestCase to avoid having a

              # `parseindex` method that would be shadowed by future subclasses

              # this duplication will soon be removed

        Georges Racinet on incendie.racinet.fr
    
rust-index: renamed `MixedIndex` as `Index`...

              r52147
            
              return RustIndex(data, REVLOGV1)

	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

Matt Harbison typing: add `from __future__ import annotations` to most files...	r52756	from __future__ import annotations

marmoute test: extract some generic data and utility from test-rust-ancestor.py...	r44397	import unittest

		# picked from test-parse-index2, copied rather than imported
		# so that it stays stable even if test-parse-index2 changes or disappears.
		data_non_inlined = (
		b'\x00\x00\x00\x01\x00\x00\x00\x00\x00\x01D\x19'
		b'\x00\x07e\x12\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff'
		b'\xff\xff\xff\xff\xd1\xf4\xbb\xb0\xbe\xfc\x13\xbd\x8c\xd3\x9d'
		b'\x0f\xcd\xd9;\x8c\x07\x8cJ/\x00\x00\x00\x00\x00\x00\x00\x00\x00'
		b'\x00\x00\x00\x00\x00\x00\x01D\x19\x00\x00\x00\x00\x00\xdf\x00'
		b'\x00\x01q\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\xff'
		b'\xff\xff\xff\xc1\x12\xb9\x04\x96\xa4Z1t\x91\xdfsJ\x90\xf0\x9bh'
		b'\x07l&\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
		b'\x00\x01D\xf8\x00\x00\x00\x00\x01\x1b\x00\x00\x01\xb8\x00\x00'
		b'\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\xff\xff\xff\xff\x02\n'
		b'\x0e\xc6&\xa1\x92\xae6\x0b\x02i\xfe-\xe5\xbao\x05\xd1\xe7\x00'
		b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01F'
		b'\x13\x00\x00\x00\x00\x01\xec\x00\x00\x03\x06\x00\x00\x00\x01'
		b'\x00\x00\x00\x03\x00\x00\x00\x02\xff\xff\xff\xff\x12\xcb\xeby1'
		b'\xb6\r\x98B\xcb\x07\xbd`\x8f\x92\xd9\xc4\x84\xbdK\x00\x00\x00'
		b'\x00\x00\x00\x00\x00\x00\x00\x00\x00'
		)

Georges Racinet rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...	r52132	from ..revlogutils.constants import REVLOGV1

marmoute test: extract some generic data and utility from test-rust-ancestor.py...	r44397
		try:
Matt Harbison typing: disable import error warnings that are already handled...	r47543	from ..cext import parsers as cparsers # pytype: disable=import-error
marmoute test: extract some generic data and utility from test-rust-ancestor.py...	r44397	except ImportError:
		cparsers = None

Georges Racinet rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...	r52132	try:
Georges Racinet on incendie.racinet.fr rust-index: renamed `MixedIndex` as `Index`...	r52147	from ..rustext.revlog import ( # pytype: disable=import-error
		Index as RustIndex,
		)
Georges Racinet rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...	r52132	except ImportError:
Georges Racinet on incendie.racinet.fr rust-index: renamed `MixedIndex` as `Index`...	r52147	RustIndex = None
Georges Racinet rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...	r52132
marmoute test: extract some generic data and utility from test-rust-ancestor.py...	r44397
		@unittest.skipIf(
		cparsers is None,
		'The C version of the "parsers" module is not available. It is needed for this test.',
		)
		class RevlogBasedTestBase(unittest.TestCase):
Georges Racinet rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...	r52132	def parseindex(self, data=None):
		if data is None:
		data = data_non_inlined
		return cparsers.parse_index2(data, False)[0]

Georges Racinet on incendie.racinet.fr rust-python-testing: separated base test classes...	r52137
		@unittest.skipIf(
Georges Racinet on incendie.racinet.fr rust-index: renamed `MixedIndex` as `Index`...	r52147	RustIndex is None,
Georges Racinet on incendie.racinet.fr rust-python-testing: separated base test classes...	r52137	'The Rust index is not available. It is needed for this test.',
		)
		class RustRevlogBasedTestBase(unittest.TestCase):
Georges Racinet rust-index: using the `hg::index::Index` in ancestors iterator and lazy set...	r52132	def parserustindex(self, data=None):
		if data is None:
		data = data_non_inlined
Georges Racinet on incendie.racinet.fr rust-python-testing: separated base test classes...	r52137	# not inheriting RevlogBasedTestCase to avoid having a
		# `parseindex` method that would be shadowed by future subclasses
		# this duplication will soon be removed
Georges Racinet on incendie.racinet.fr rust-index: renamed `MixedIndex` as `Index`...	r52147	return RustIndex(data, REVLOGV1)