view mercurial/cacheutil.py @ 45412:aaeccdb6e654 stable

repoview: pin revisions for `local` and `other` when a merge is active

I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes
`p1` and updating to the successor results in merge conflicts.  The problem was
resolving them failed immediately, complaining that the old checkout was
filtered.

The change in `test-rebase-obsolete.t` is because there's an outstanding merge
conflict in a rebase operation.  The summary prompt to merge seems incorrect for
this scenario, but that's an existing issue.

Differential Revision: https://phab.mercurial-scm.org/D8980

# scmutil.py - Mercurial core utility functions
#
#  Copyright Matt Mackall <[e-mail]> 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