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

             txnutil.py
        
                    33 lines
            
             | 978 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / txnutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # txnutil.py - transaction related utilities

      #

      #  Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others

      #

      # 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

      from . import encoding

      def mayhavepending(root):

          """return whether 'root' may have pending changes, which are

          visible to this process.

          """

          return root == encoding.environ.get(b'HG_PENDING')

      def trypending(root, vfs, filename, **kwargs):

          """Open  file to be read according to HG_PENDING environment variable

          This opens '.pending' of specified 'filename' only when HG_PENDING

          is equal to 'root'.

          This returns '(fp, is_pending_opened)' tuple.

          """

          if mayhavepending(root):

              try:

                  return (vfs(b'%s.pending' % filename, **kwargs), True)

              except FileNotFoundError:

                  pass

          return (vfs(filename, **kwargs), False)

	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

				# txnutil.py - transaction related utilities
				#
				# Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others
				#
				# 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

				from . import encoding


				def mayhavepending(root):
				"""return whether 'root' may have pending changes, which are
				visible to this process.
				"""
				return root == encoding.environ.get(b'HG_PENDING')


				def trypending(root, vfs, filename, **kwargs):
				"""Open file to be read according to HG_PENDING environment variable

				This opens '.pending' of specified 'filename' only when HG_PENDING
				is equal to 'root'.

				This returns '(fp, is_pending_opened)' tuple.
				"""
				if mayhavepending(root):
				try:
				return (vfs(b'%s.pending' % filename, **kwargs), True)
				except FileNotFoundError:
				pass
				return (vfs(filename, **kwargs), False)