narrow: allow merging non-conflicting change outside of the narrow spec We use the mergestate to carry information about these merge action and reprocess them at commit time to apply the necessary update. The dirstate itself is never affected and remains "pure", with content only in the narrow-spec. This file involved in such merge are therefor not listed in `hg status`. The current testing is based on a modification of the previous testing, that refused to do such merges. As a result it is a bit simple and more extensive code and testing testing will have to be introduced later. I am planning to do this extra testing, soon. In addition, this only works for flat manifest. Support for tree manifest will need more work. I am not currently planning to do this work. Differential Revision: https://phab.mercurial-scm.org/D12119

     1

# scmutil.py - Mercurial core utility functions

     2

#

     3

#  Copyright Olivia Mackall <olivia@selenic.com> and other

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

from __future__ import absolute_import

     8

     9

from . import repoview

    10

    11

    12

def cachetocopy(srcrepo):

    13

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

    14

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

    15

    # ones. Therefore copy all branch caches over.

    16

    cachefiles = [b'branch2']

    17

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

    18

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

    19

    cachefiles += [b'tags2']

    20

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

    21

    cachefiles += [b'hgtagsfnodes1']

    22

    return cachefiles