upstream/mercurial-mirror Files · mercurial/revlogutils/constants.py

py3: avoid iterating over a literal bytes in highlight...

py3: avoid iterating over a literal bytes in highlight In Python 3, iterating over a bytes literal yields integers. Since we use the value in `text.replace()`, this fails on Python 3 with the following trackback: Traceback (most recent call last): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgwebdir_mod.py", line 378, in run_wsgi for r in self._runwsgi(req, res): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 326, in run_wsgi for r in self._runwsgi(req, res, repo): File "/usr/lib/python3/dist-packages/mercurial/hgweb/hgweb_mod.py", line 449, in _runwsgi return getattr(webcommands, cmd)(rctx) File "/usr/lib/python3/dist-packages/mercurial/hgweb/webcommands.py", line 211, in file return _filerevision(web, webutil.filectx(web.repo, web.req)) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 72, in filerevision_highlight pygmentize(web, b'fileline', fctx, web.tmpl) File "/usr/lib/python3/dist-packages/hgext/highlight/__init__.py", line 58, in pygmentize field, fctx, style, tmpl, guessfilenameonly=filenameonly File "/usr/lib/python3/dist-packages/hgext/highlight/highlight.py", line 62, in pygmentize text = text.replace(c, b'') TypeError: a bytes-like object is required, not 'int'

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r44014:856cce0c

stable

Download file

             constants.py
        
                    57 lines
            
             | 1.9 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / revlogutils / constants.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # revlogdeltas.py - constant used for revlog logic

      #

      # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>

      # Copyright 2018 Octobus <contact@octobus.net>

      #

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

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

      """Helper class to compute deltas stored inside revlogs"""

      from __future__ import absolute_import

      from ..interfaces import repository

      # revlog header flags

      REVLOGV0 = 0

      REVLOGV1 = 1

      # Dummy value until file format is finalized.

      # Reminder: change the bounds check in revlog.__init__ when this is changed.

      REVLOGV2 = 0xDEAD

      # Shared across v1 and v2.

      FLAG_INLINE_DATA = 1 << 16

      # Only used by v1, implied by v2.

      FLAG_GENERALDELTA = 1 << 17

      REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA

      REVLOG_DEFAULT_FORMAT = REVLOGV1

      REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS

      REVLOGV1_FLAGS = FLAG_INLINE_DATA | FLAG_GENERALDELTA

      REVLOGV2_FLAGS = FLAG_INLINE_DATA

      # revlog index flags

      # For historical reasons, revlog's internal flags were exposed via the

      # wire protocol and are even exposed in parts of the storage APIs.

      # revision has censor metadata, must be verified

      REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED

      # revision hash does not match data (narrowhg)

      REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS

      # revision data is stored externally

      REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED

      # revision data contains extra metadata not part of the official digest

      REVIDX_SIDEDATA = repository.REVISION_FLAG_SIDEDATA

      REVIDX_DEFAULT_FLAGS = 0

      # stable order in which flags need to be processed and their processors applied

      REVIDX_FLAGS_ORDER = [

          REVIDX_ISCENSORED,

          REVIDX_ELLIPSIS,

          REVIDX_EXTSTORED,

          REVIDX_SIDEDATA,

      ]

      # bitmark for flags that could cause rawdata content change

      REVIDX_RAWTEXT_CHANGING_FLAGS = (

          REVIDX_ISCENSORED | REVIDX_EXTSTORED | REVIDX_SIDEDATA

      )

      SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000

	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

				# revlogdeltas.py - constant used for revlog logic
				#
				# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
				# Copyright 2018 Octobus <contact@octobus.net>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.
				"""Helper class to compute deltas stored inside revlogs"""

				from __future__ import absolute_import

				from ..interfaces import repository

				# revlog header flags
				REVLOGV0 = 0
				REVLOGV1 = 1
				# Dummy value until file format is finalized.
				# Reminder: change the bounds check in revlog.__init__ when this is changed.
				REVLOGV2 = 0xDEAD
				# Shared across v1 and v2.
				FLAG_INLINE_DATA = 1 << 16
				# Only used by v1, implied by v2.
				FLAG_GENERALDELTA = 1 << 17
				REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA
				REVLOG_DEFAULT_FORMAT = REVLOGV1
				REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT \| REVLOG_DEFAULT_FLAGS
				REVLOGV1_FLAGS = FLAG_INLINE_DATA \| FLAG_GENERALDELTA
				REVLOGV2_FLAGS = FLAG_INLINE_DATA

				# revlog index flags

				# For historical reasons, revlog's internal flags were exposed via the
				# wire protocol and are even exposed in parts of the storage APIs.

				# revision has censor metadata, must be verified
				REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED
				# revision hash does not match data (narrowhg)
				REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS
				# revision data is stored externally
				REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED
				# revision data contains extra metadata not part of the official digest
				REVIDX_SIDEDATA = repository.REVISION_FLAG_SIDEDATA
				REVIDX_DEFAULT_FLAGS = 0
				# stable order in which flags need to be processed and their processors applied
				REVIDX_FLAGS_ORDER = [
				REVIDX_ISCENSORED,
				REVIDX_ELLIPSIS,
				REVIDX_EXTSTORED,
				REVIDX_SIDEDATA,
				]

				# bitmark for flags that could cause rawdata content change
				REVIDX_RAWTEXT_CHANGING_FLAGS = (
				REVIDX_ISCENSORED \| REVIDX_EXTSTORED \| REVIDX_SIDEDATA
				)

				SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000