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

bundle2: store changeset count when creating file bundles...

bundle2: store changeset count when creating file bundles The bundle2 changegroup part has an advisory param saying how many changesets are in the part. Before this patch, we were setting this part when generating bundle2 parts via the wire protocol but not when generating local bundle2 files. A side effect of not setting the changeset count part is that progress bars don't work when applying changesets. As the tests show, this impacted clone bundles, shelve, backup bundles, `hg unbundle`, and anything touching bundle2 files. This patch adds a backdoor to allow us to pass state from changegroup generation into the unbundler. We store the number of changesets in the changegroup in this state and use it to populate the aforementioned advisory part parameter when generating the bundle2 bundle. I concede that I'm not thrilled by how state is being passed in changegroup.py (it feels a bit hacky). I would love to overhaul the rather confusing set of functions in changegroup.py with something that passes rich objects around instead of e.g. low-level generators. However, given the code freeze for 3.9 is imminent, I'd rather not undertake this endeavor right now. This feels like the easiest way to get the parameter added to the changegroup part.

Maciej Fijalkowski - - Load All Authors

File last commit:

r29490:b4d117ce default


                r29593:953839de

default

Download file

             policy.py
        
                    45 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / policy.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # policy.py - module policy logic for Mercurial.

      #

      # Copyright 2015 Gregory Szorc <gregory.szorc@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 os

      import sys

      # Rules for how modules can be loaded. Values are:

      #

      #    c - require C extensions

      #    allow - allow pure Python implementation when C loading fails

      #    cffi - required cffi versions (implemented within pure module)

      #    cffi-allow - allow pure Python implementation if cffi version is missing

      #    py - only load pure Python modules

      #

      # By default, require the C extensions for performance reasons.

      policy = 'c'

      policynoc = ('cffi', 'cffi-allow', 'py')

      policynocffi = ('c', 'py')

      try:

          from . import __modulepolicy__

          policy = __modulepolicy__.modulepolicy

      except ImportError:

          pass

      # PyPy doesn't load C extensions.

      #

      # The canonical way to do this is to test platform.python_implementation().

      # But we don't import platform and don't bloat for it here.

      if '__pypy__' in sys.builtin_module_names:

          policy = 'cffi'

      # Our C extensions aren't yet compatible with Python 3. So use pure Python

      # on Python 3 for now.

      if sys.version_info[0] >= 3:

          policy = 'py'

      # Environment variable can always force settings.

      policy = os.environ.get('HGMODULEPOLICY', policy)

	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

				# policy.py - module policy logic for Mercurial.
				#
				# Copyright 2015 Gregory Szorc <gregory.szorc@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 os
				import sys

				# Rules for how modules can be loaded. Values are:
				#
				# c - require C extensions
				# allow - allow pure Python implementation when C loading fails
				# cffi - required cffi versions (implemented within pure module)
				# cffi-allow - allow pure Python implementation if cffi version is missing
				# py - only load pure Python modules
				#
				# By default, require the C extensions for performance reasons.
				policy = 'c'
				policynoc = ('cffi', 'cffi-allow', 'py')
				policynocffi = ('c', 'py')

				try:
				from . import __modulepolicy__
				policy = __modulepolicy__.modulepolicy
				except ImportError:
				pass

				# PyPy doesn't load C extensions.
				#
				# The canonical way to do this is to test platform.python_implementation().
				# But we don't import platform and don't bloat for it here.
				if '__pypy__' in sys.builtin_module_names:
				policy = 'cffi'

				# Our C extensions aren't yet compatible with Python 3. So use pure Python
				# on Python 3 for now.
				if sys.version_info[0] >= 3:
				policy = 'py'

				# Environment variable can always force settings.
				policy = os.environ.get('HGMODULEPOLICY', policy)