upstream/mercurial-mirror Files · mercurial/node.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

             node.py
        
                    61 lines
            
             | 1.8 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
put license and copyright info into comment blocks

              r8226
            
      # node.py - basic nodeid manipulation for mercurial

      #

        Raphaël Gomès
    
contributor: change mentions of mpm to olivia...

              r47575
            
      # Copyright 2005, 2006 Olivia Mackall <olivia@selenic.com>

        Martin Geisler
    
put license and copyright info into comment blocks

              r8226
            
      #

      # This software may be used and distributed according to the terms of the

        Matt Mackall
    
Update license to GPLv2+

              r10263
            
      # GNU General Public License version 2 or any later version.

        mpm@selenic.com
    
Break apart hg.py...

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

              r52756
            
      from __future__ import annotations

        Gregory Szorc
    
node: use absolute_import

              r25962
            
        Matt Mackall
    
Replace demandload with new demandimport

              r3877
            
      import binascii

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

              r26980
            
      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

        Manuel Jacob
    
node: stop converting binascii.Error to TypeError in bin()...

              r50143
            
      bin = binascii.unhexlify

        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

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

              r43345
            
        Joerg Sonnenberger
    
node: introduce nodeconstants class...

              r47538
            
      def short(node):

          return hex(node[:6])

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Joerg Sonnenberger
    
node: introduce nodeconstants class...

              r47538
            
      nullrev = -1

        Durham Goode
    
dirstate: change placeholder hash length to 20 bytes...

              r30360
            
        Joerg Sonnenberger
    
node: introduce nodeconstants class...

              r47538
            
      # pseudo identifier for working directory

      # (experimental, so don't add too many dependencies on it)

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

              r43345
            
      wdirrev = 0x7FFFFFFF

        Yuya Nishihara
    
node: define experimental identifiers for working directory...

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

              r43345
            
        Gregory Szorc
    
py3: use class X: instead of class X(object):...

              r49801
            
      class sha1nodeconstants:

        Joerg Sonnenberger
    
node: introduce nodeconstants class...

              r47538
            
          nodelen = 20

          # In hex, this is '0000000000000000000000000000000000000000'

          nullid = b"\0" * nodelen

          nullhex = hex(nullid)

          # Phony node value to stand-in for new files in some uses of

          # manifests.

          # In hex, this is '2121212121212121212121212121212121212121'

          newnodeid = b'!!!!!!!!!!!!!!!!!!!!'

          # In hex, this is '3030303030303030303030303030306164646564'

          addednodeid = b'000000000000000added'

          # In hex, this is '3030303030303030303030306d6f646966696564'

          modifiednodeid = b'000000000000modified'

          wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

          # pseudo identifier for working directory

          # (experimental, so don't add too many dependencies on it)

          # In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'

          wdirid = b"\xff" * nodelen

          wdirhex = hex(wdirid)

      # legacy starting point for porting modules

      nullid = sha1nodeconstants.nullid

      nullhex = sha1nodeconstants.nullhex

      newnodeid = sha1nodeconstants.newnodeid

      addednodeid = sha1nodeconstants.addednodeid

      modifiednodeid = sha1nodeconstants.modifiednodeid

      wdirfilenodeids = sha1nodeconstants.wdirfilenodeids

      wdirid = sha1nodeconstants.wdirid

      wdirhex = sha1nodeconstants.wdirhex

	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

Martin Geisler put license and copyright info into comment blocks	r8226	# node.py - basic nodeid manipulation for mercurial
		#
Raphaël Gomès contributor: change mentions of mpm to olivia...	r47575	# Copyright 2005, 2006 Olivia Mackall <olivia@selenic.com>
Martin Geisler put license and copyright info into comment blocks	r8226	#
		# This software may be used and distributed according to the terms of the
Matt Mackall Update license to GPLv2+	r10263	# GNU General Public License version 2 or any later version.
mpm@selenic.com Break apart hg.py...	r1089
Matt Harbison typing: add `from __future__ import annotations` to most files...	r52756	from __future__ import annotations
Gregory Szorc node: use absolute_import	r25962
Matt Mackall Replace demandload with new demandimport	r3877	import binascii
mpm@selenic.com Break apart hg.py...	r1089
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980	# This ugly style has a noticeable effect in manifest parsing
		hex = binascii.hexlify
Manuel Jacob node: stop converting binascii.Error to TypeError in bin()...	r50143	bin = binascii.unhexlify
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980
Augie Fackler style: run a patched black on a subset of mercurial...	r43345
Joerg Sonnenberger node: introduce nodeconstants class...	r47538	def short(node):
		return hex(node[:6])

mpm@selenic.com Break apart hg.py...	r1089
Joerg Sonnenberger node: introduce nodeconstants class...	r47538	nullrev = -1
Durham Goode dirstate: change placeholder hash length to 20 bytes...	r30360
Joerg Sonnenberger node: introduce nodeconstants class...	r47538	# pseudo identifier for working directory
		# (experimental, so don't add too many dependencies on it)
Augie Fackler style: run a patched black on a subset of mercurial...	r43345	wdirrev = 0x7FFFFFFF
Yuya Nishihara node: define experimental identifiers for working directory...	r25737
Augie Fackler style: run a patched black on a subset of mercurial...	r43345
Gregory Szorc py3: use class X: instead of class X(object):...	r49801	class sha1nodeconstants:
Joerg Sonnenberger node: introduce nodeconstants class...	r47538	nodelen = 20

		# In hex, this is '0000000000000000000000000000000000000000'
		nullid = b"\0" * nodelen
		nullhex = hex(nullid)

		# Phony node value to stand-in for new files in some uses of
		# manifests.
		# In hex, this is '2121212121212121212121212121212121212121'
		newnodeid = b'!!!!!!!!!!!!!!!!!!!!'
		# In hex, this is '3030303030303030303030303030306164646564'
		addednodeid = b'000000000000000added'
		# In hex, this is '3030303030303030303030306d6f646966696564'
		modifiednodeid = b'000000000000modified'

		wdirfilenodeids = {newnodeid, addednodeid, modifiednodeid}

		# pseudo identifier for working directory
		# (experimental, so don't add too many dependencies on it)
		# In hex, this is 'ffffffffffffffffffffffffffffffffffffffff'
		wdirid = b"\xff" * nodelen
		wdirhex = hex(wdirid)


		# legacy starting point for porting modules
		nullid = sha1nodeconstants.nullid
		nullhex = sha1nodeconstants.nullhex
		newnodeid = sha1nodeconstants.newnodeid
		addednodeid = sha1nodeconstants.addednodeid
		modifiednodeid = sha1nodeconstants.modifiednodeid
		wdirfilenodeids = sha1nodeconstants.wdirfilenodeids
		wdirid = sha1nodeconstants.wdirid
		wdirhex = sha1nodeconstants.wdirhex