upstream/mercurial-mirror Files · mercurial/py3kcompat.py

verify: don't init subrepo when missing one is referenced (issue5128) (API)...

verify: don't init subrepo when missing one is referenced (issue5128) (API) Initializing a subrepo when one doesn't exist is the right thing to do when the parent is being updated, but in few other cases. Unfortunately, there isn't enough context in the subrepo module to distinguish this case. This same issue can be caused with other subrepo aware commands, so there is a general issue here beyond the scope of this fix. A simpler attempt I tried was to add an '_updating' boolean to localrepo, and set/clear it around the call to mergemod.update() in hg.updaterepo(). That mostly worked, but doesn't handle the case where archive will clone the subrepo if it is missing. (I vaguely recall that there may be other commands that will clone if needed like this, but certainly not all do. It seems both handy, and a bit surprising for what should be a read only operation. It might be nice if all commands did this consistently, but we probably need Angel's subrepo caching first, to not make a mess of the working directory.) I originally handled 'Exception' in order to pick up the Aborts raised in subrepo.state(), but this turns out to be unnecessary because that is called once and cached by ctx.sub() when iterating the subrepos. It was suggested in the bug discussion to skip looking at the subrepo links unless -S is specified. I don't really like that idea because missing a subrepo or (less likely, but worse) a corrupt .hgsubstate is a problem of the parent repo when checking out a revision. The -S option seems like a better fit for functionality that would recurse into each subrepo and do a full verification. Ultimately, the default value for 'allowcreate' should probably be flipped, but since the default behavior was to allow creation, this is less risky for now.

Gregory Szorc - - Load All Authors

File last commit:

r27486:5bfd01a3 default


                r29021:92d37fb3

stable

Download file

             py3kcompat.py
        
                    68 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / py3kcompat.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # py3kcompat.py - compatibility definitions for running hg in py3k

      #

      # Copyright 2010 Renato Cunha <renatoc@gmail.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

      import builtins

      import numbers

      Number = numbers.Number

      def bytesformatter(format, args):

          '''Custom implementation of a formatter for bytestrings.

          This function currently relies on the string formatter to do the

          formatting and always returns bytes objects.

          >>> bytesformatter(20, 10)

          0

          >>> bytesformatter('unicode %s, %s!', ('string', 'foo'))

          b'unicode string, foo!'

          >>> bytesformatter(b'test %s', 'me')

          b'test me'

          >>> bytesformatter('test %s', 'me')

          b'test me'

          >>> bytesformatter(b'test %s', b'me')

          b'test me'

          >>> bytesformatter('test %s', b'me')

          b'test me'

          >>> bytesformatter('test %d: %s', (1, b'result'))

          b'test 1: result'

          '''

          # The current implementation just converts from bytes to unicode, do

          # what's needed and then convert the results back to bytes.

          # Another alternative is to use the Python C API implementation.

          if isinstance(format, Number):

              # If the fixer erroneously passes a number remainder operation to

              # bytesformatter, we just return the correct operation

              return format % args

          if isinstance(format, bytes):

              format = format.decode('utf-8', 'surrogateescape')

          if isinstance(args, bytes):

              args = args.decode('utf-8', 'surrogateescape')

          if isinstance(args, tuple):

              newargs = []

              for arg in args:

                  if isinstance(arg, bytes):

                      arg = arg.decode('utf-8', 'surrogateescape')

                  newargs.append(arg)

              args = tuple(newargs)

          ret = format % args

          return ret.encode('utf-8', 'surrogateescape')

      builtins.bytesformatter = bytesformatter

      origord = builtins.ord

      def fakeord(char):

          if isinstance(char, int):

              return char

          return origord(char)

      builtins.ord = fakeord

      if __name__ == '__main__':

          import doctest

          doctest.testmod()

	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

				# py3kcompat.py - compatibility definitions for running hg in py3k
				#
				# Copyright 2010 Renato Cunha <renatoc@gmail.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

				import builtins
				import numbers

				Number = numbers.Number

				def bytesformatter(format, args):
				'''Custom implementation of a formatter for bytestrings.

				This function currently relies on the string formatter to do the
				formatting and always returns bytes objects.

				>>> bytesformatter(20, 10)
				0
				>>> bytesformatter('unicode %s, %s!', ('string', 'foo'))
				b'unicode string, foo!'
				>>> bytesformatter(b'test %s', 'me')
				b'test me'
				>>> bytesformatter('test %s', 'me')
				b'test me'
				>>> bytesformatter(b'test %s', b'me')
				b'test me'
				>>> bytesformatter('test %s', b'me')
				b'test me'
				>>> bytesformatter('test %d: %s', (1, b'result'))
				b'test 1: result'
				'''
				# The current implementation just converts from bytes to unicode, do
				# what's needed and then convert the results back to bytes.
				# Another alternative is to use the Python C API implementation.
				if isinstance(format, Number):
				# If the fixer erroneously passes a number remainder operation to
				# bytesformatter, we just return the correct operation
				return format % args
				if isinstance(format, bytes):
				format = format.decode('utf-8', 'surrogateescape')
				if isinstance(args, bytes):
				args = args.decode('utf-8', 'surrogateescape')
				if isinstance(args, tuple):
				newargs = []
				for arg in args:
				if isinstance(arg, bytes):
				arg = arg.decode('utf-8', 'surrogateescape')
				newargs.append(arg)
				args = tuple(newargs)
				ret = format % args
				return ret.encode('utf-8', 'surrogateescape')
				builtins.bytesformatter = bytesformatter

				origord = builtins.ord
				def fakeord(char):
				if isinstance(char, int):
				return char
				return origord(char)
				builtins.ord = fakeord

				if __name__ == '__main__':
				import doctest
				doctest.testmod()