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

update: fix spurious unclean status bug shown by previous commit...

update: fix spurious unclean status bug shown by previous commit The crux of the problem is: - the dirstate is corrupted (the sizes/dates are assigned to the wrong files) - because when worker.worker is used with a return value (batchget in merge.py here), the return value when worker.worker effectively parallelizes is permuted - this is because worker.worker's partition of input and combination of output values are not inverses of one another: it split [1,2,3,4,5,6] into [[1,3,5],[2,4,6]], but combines that into [1,3,5,2,4,6]. Given that worker.worker doesn't call its function argument on contiguous chunks on the input arguments, sticking with lists means we'd need to know the relation between the inputs of worker.worker function argument (for instance, requiring that every input element is mapped to exactly one output element). It seems better to instead switch return values to dicts, which can combined reliably with a straighforward restriction. Differential Revision: https://phab.mercurial-scm.org/D6581

Boris Feld - - Load All Authors

File last commit:

r35784:72fdd99e default


                r42722:d29db0a0

default

Download file

             cacheutil.py
        
                    21 lines
            
             | 814 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cacheutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # scmutil.py - Mercurial core utility functions

      #

      #  Copyright Matt Mackall <mpm@selenic.com> and other

      #

      # 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 . import repoview

      def cachetocopy(srcrepo):

          """return the list of cache file valuable to copy during a clone"""

          # In local clones we're copying all nodes, not just served

          # ones. Therefore copy all branch caches over.

          cachefiles = ['branch2']

          cachefiles += ['branch2-%s' % f for f in repoview.filtertable]

          cachefiles += ['rbc-names-v1', 'rbc-revs-v1']

          cachefiles += ['tags2']

          cachefiles += ['tags2-%s' % f for f in repoview.filtertable]

          cachefiles += ['hgtagsfnodes1']

          return cachefiles

	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

				# scmutil.py - Mercurial core utility functions
				#
				# Copyright Matt Mackall <mpm@selenic.com> and other
				#
				# 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 . import repoview

				def cachetocopy(srcrepo):
				"""return the list of cache file valuable to copy during a clone"""
				# In local clones we're copying all nodes, not just served
				# ones. Therefore copy all branch caches over.
				cachefiles = ['branch2']
				cachefiles += ['branch2-%s' % f for f in repoview.filtertable]
				cachefiles += ['rbc-names-v1', 'rbc-revs-v1']
				cachefiles += ['tags2']
				cachefiles += ['tags2-%s' % f for f in repoview.filtertable]
				cachefiles += ['hgtagsfnodes1']
				return cachefiles