upstream/mercurial-mirror Files · mercurial/utils/repoviewutil.py

highlight: fix encoding issues to enable Py3 compatibility...

highlight: fix encoding issues to enable Py3 compatibility This commit fixes various encoding issues with the `highlight` extension to enable compatibility with Python 3. Python `.encode()` and `.decode()` requires the target encoding to be passed as a `str`, so the value of `mercurial.encoding.encoding` must be converted before passing to the function. Pygments also assumes the `str` type for values it works with, so we must perform conversions before and after receiving values from its APIs. After applying this patch, `test-highlight.t` passes under Python 3. We add it to `python3-whitelist` as well. Tested with Pygments 2.4.2. Differential Revision: https://phab.mercurial-scm.org/D6832

marmoute - - Load All Authors

File last commit:

r42309:890f450f default


                r43193:a7abc608

default

Download file

             repoviewutil.py
        
                    22 lines
            
             | 833 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / utils / repoviewutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # repoviewutil.py - constaints data relevant to repoview.py and other module

      #

      # Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>

      #                Logilab SA        <contact@logilab.fr>

      #

      # 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 absolute_import

      ### Nearest subset relation

      # Nearest subset of filter X is a filter Y so that:

      # * Y is included in X,

      # * X - Y is as small as possible.

      # This create and ordering used for branchmap purpose.

      # the ordering may be partial

      subsettable = {None: 'visible',

                     'visible-hidden': 'visible',

                     'visible': 'served',

                     'served.hidden': 'served',

                     'served': 'immutable',

                     'immutable': 'base'}

	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

				# repoviewutil.py - constaints data relevant to repoview.py and other module
				#
				# Copyright 2012 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
				# Logilab SA <contact@logilab.fr>
				#
				# 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 absolute_import

				### Nearest subset relation
				# Nearest subset of filter X is a filter Y so that:
				# * Y is included in X,
				# * X - Y is as small as possible.
				# This create and ordering used for branchmap purpose.
				# the ordering may be partial
				subsettable = {None: 'visible',
				'visible-hidden': 'visible',
				'visible': 'served',
				'served.hidden': 'served',
				'served': 'immutable',
				'immutable': 'base'}