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

r43347:687b865b default


                r44014:856cce0c

stable

Download file

             rewriteutil.py
        
                    55 lines
            
             | 1.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / rewriteutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # rewriteutil.py - utility functions for rewriting changesets

      #

      # Copyright 2017 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.

      from __future__ import absolute_import

      from .i18n import _

      from . import (

          error,

          node,

          obsolete,

          revset,

      )

      def precheck(repo, revs, action=b'rewrite'):

          """check if revs can be rewritten

          action is used to control the error message.

          Make sure this function is called after taking the lock.

          """

          if node.nullrev in revs:

              msg = _(b"cannot %s null changeset") % action

              hint = _(b"no changeset checked out")

              raise error.Abort(msg, hint=hint)

          if len(repo[None].parents()) > 1:

              raise error.Abort(_(b"cannot %s while merging") % action)

          publicrevs = repo.revs(b'%ld and public()', revs)

          if publicrevs:

              msg = _(b"cannot %s public changesets") % action

              hint = _(b"see 'hg help phases' for details")

              raise error.Abort(msg, hint=hint)

          newunstable = disallowednewunstable(repo, revs)

          if newunstable:

              raise error.Abort(_(b"cannot %s changeset with children") % action)

      def disallowednewunstable(repo, revs):

          """Checks whether editing the revs will create new unstable changesets and

          are we allowed to create them.

          To allow new unstable changesets, set the config:

              `experimental.evolution.allowunstable=True`

          """

          allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)

          if allowunstable:

              return revset.baseset()

          return repo.revs(b"(%ld::) - %ld", revs, revs)

	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

				# rewriteutil.py - utility functions for rewriting changesets
				#
				# Copyright 2017 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.

				from __future__ import absolute_import

				from .i18n import _

				from . import (
				error,
				node,
				obsolete,
				revset,
				)


				def precheck(repo, revs, action=b'rewrite'):
				"""check if revs can be rewritten
				action is used to control the error message.

				Make sure this function is called after taking the lock.
				"""
				if node.nullrev in revs:
				msg = _(b"cannot %s null changeset") % action
				hint = _(b"no changeset checked out")
				raise error.Abort(msg, hint=hint)

				if len(repo[None].parents()) > 1:
				raise error.Abort(_(b"cannot %s while merging") % action)

				publicrevs = repo.revs(b'%ld and public()', revs)
				if publicrevs:
				msg = _(b"cannot %s public changesets") % action
				hint = _(b"see 'hg help phases' for details")
				raise error.Abort(msg, hint=hint)

				newunstable = disallowednewunstable(repo, revs)
				if newunstable:
				raise error.Abort(_(b"cannot %s changeset with children") % action)


				def disallowednewunstable(repo, revs):
				"""Checks whether editing the revs will create new unstable changesets and
				are we allowed to create them.

				To allow new unstable changesets, set the config:
				`experimental.evolution.allowunstable=True`
				"""
				allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
				if allowunstable:
				return revset.baseset()
				return repo.revs(b"(%ld::) - %ld", revs, revs)