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
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # node.py - basic nodeid manipulation for mercurial

      #

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

      #

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

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

      from __future__ import annotations

      import binascii

      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

      bin = binascii.unhexlify

      def short(node):

          return hex(node[:6])

      nullrev = -1

      # pseudo identifier for working directory

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

      wdirrev = 0x7FFFFFFF

      class sha1nodeconstants:

          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

				# node.py - basic nodeid manipulation for mercurial
				#
				# Copyright 2005, 2006 Olivia Mackall <olivia@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import annotations

				import binascii

				# This ugly style has a noticeable effect in manifest parsing
				hex = binascii.hexlify
				bin = binascii.unhexlify


				def short(node):
				return hex(node[:6])


				nullrev = -1

				# pseudo identifier for working directory
				# (experimental, so don't add too many dependencies on it)
				wdirrev = 0x7FFFFFFF


				class sha1nodeconstants:
				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