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

tests: test divergence created during interrupted rebase...

tests: test divergence created during interrupted rebase If a rebase runs into conflicts and the user somehow rewrites an unrebased commit in the rebase set while the rebase is interrupted, continuing it might result in divergence. It turns out that we decide to skip the commit. That seems to make sense, but it wasn't obvious to me that that's what we should do. Either way, this patch adds a test case for the current behavior. Differential Revision: https://phab.mercurial-scm.org/D10256

Raphaël Gomès - - Load All Authors

File last commit:

r47575:d4ba4d51 default


                r47586:6648307d

default

Download file

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

      # scmutil.py - Mercurial core utility functions

      #

      #  Copyright Olivia Mackall <olivia@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 = [b'branch2']

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

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

          cachefiles += [b'tags2']

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

          cachefiles += [b'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 Olivia Mackall <olivia@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 = [b'branch2']
				cachefiles += [b'branch2-%s' % f for f in repoview.filtertable]
				cachefiles += [b'rbc-names-v1', b'rbc-revs-v1']
				cachefiles += [b'tags2']
				cachefiles += [b'tags2-%s' % f for f in repoview.filtertable]
				cachefiles += [b'hgtagsfnodes1']
				return cachefiles