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

context: don't count deleted files as candidates for path conflicts in IMM...

context: don't count deleted files as candidates for path conflicts in IMM This patch makes sure we don't consider the deleted files in our IMM wctx as potential conflicts while calculating paths conflicts. This fixes the bug demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D4543

Boris Feld - - Load All Authors

File last commit:

r35784:72fdd99e default


                r39612:fa4d16da

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