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

             dirstateguard.py
        
                    84 lines
            
             | 2.6 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / dirstateguard.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # dirstateguard.py - class to allow restoring dirstate after failure

      #

      # Copyright 2005-2007 Matt Mackall <mpm@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 absolute_import

      from .i18n import _

      from . import (

          error,

          narrowspec,

          util,

      )

      class dirstateguard(util.transactional):

          '''Restore dirstate at unexpected failure.

          At the construction, this class does:

          - write current ``repo.dirstate`` out, and

          - save ``.hg/dirstate`` into the backup file

          This restores ``.hg/dirstate`` from backup file, if ``release()``

          is invoked before ``close()``.

          This just removes the backup file at ``close()`` before ``release()``.

          '''

          def __init__(self, repo, name):

              self._repo = repo

              self._active = False

              self._closed = False

              self._backupname = b'dirstate.backup.%s.%d' % (name, id(self))

              self._narrowspecbackupname = b'narrowspec.backup.%s.%d' % (

                  name,

                  id(self),

              )

              repo.dirstate.savebackup(repo.currenttransaction(), self._backupname)

              narrowspec.savewcbackup(repo, self._narrowspecbackupname)

              self._active = True

          def __del__(self):

              if self._active:  # still active

                  # this may occur, even if this class is used correctly:

                  # for example, releasing other resources like transaction

                  # may raise exception before ``dirstateguard.release`` in

                  # ``release(tr, ....)``.

                  self._abort()

          def close(self):

              if not self._active:  # already inactivated

                  msg = (

                      _(b"can't close already inactivated backup: %s")

                      % self._backupname

                  )

                  raise error.Abort(msg)

              self._repo.dirstate.clearbackup(

                  self._repo.currenttransaction(), self._backupname

              )

              narrowspec.clearwcbackup(self._repo, self._narrowspecbackupname)

              self._active = False

              self._closed = True

          def _abort(self):

              narrowspec.restorewcbackup(self._repo, self._narrowspecbackupname)

              self._repo.dirstate.restorebackup(

                  self._repo.currenttransaction(), self._backupname

              )

              self._active = False

          def release(self):

              if not self._closed:

                  if not self._active:  # already inactivated

                      msg = (

                          _(b"can't release already inactivated backup: %s")

                          % self._backupname

                      )

                      raise error.Abort(msg)

                  self._abort()

	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

				# dirstateguard.py - class to allow restoring dirstate after failure
				#
				# Copyright 2005-2007 Matt Mackall <mpm@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 absolute_import

				from .i18n import _

				from . import (
				error,
				narrowspec,
				util,
				)


				class dirstateguard(util.transactional):
				'''Restore dirstate at unexpected failure.

				At the construction, this class does:

				- write current ``repo.dirstate`` out, and
				- save ``.hg/dirstate`` into the backup file

				This restores ``.hg/dirstate`` from backup file, if ``release()``
				is invoked before ``close()``.

				This just removes the backup file at ``close()`` before ``release()``.
				'''

				def __init__(self, repo, name):
				self._repo = repo
				self._active = False
				self._closed = False
				self._backupname = b'dirstate.backup.%s.%d' % (name, id(self))
				self._narrowspecbackupname = b'narrowspec.backup.%s.%d' % (
				name,
				id(self),
				)
				repo.dirstate.savebackup(repo.currenttransaction(), self._backupname)
				narrowspec.savewcbackup(repo, self._narrowspecbackupname)
				self._active = True

				def __del__(self):
				if self._active: # still active
				# this may occur, even if this class is used correctly:
				# for example, releasing other resources like transaction
				# may raise exception before ``dirstateguard.release`` in
				# ``release(tr, ....)``.
				self._abort()

				def close(self):
				if not self._active: # already inactivated
				msg = (
				_(b"can't close already inactivated backup: %s")
				% self._backupname
				)
				raise error.Abort(msg)

				self._repo.dirstate.clearbackup(
				self._repo.currenttransaction(), self._backupname
				)
				narrowspec.clearwcbackup(self._repo, self._narrowspecbackupname)
				self._active = False
				self._closed = True

				def _abort(self):
				narrowspec.restorewcbackup(self._repo, self._narrowspecbackupname)
				self._repo.dirstate.restorebackup(
				self._repo.currenttransaction(), self._backupname
				)
				self._active = False

				def release(self):
				if not self._closed:
				if not self._active: # already inactivated
				msg = (
				_(b"can't release already inactivated backup: %s")
				% self._backupname
				)
				raise error.Abort(msg)
				self._abort()