Mercurial > hg
view mercurial/cacheutil.py @ 42129:232a33a11ce0
pull: deal with locally filtered changeset passed into --rev
Nowadays, it is possible to explicitly pull a remote revision that end up being
hidden locally (eg: obsoleted locally). However before this patch, some
internal processing where crashing trying to resolve a filtered revision.
Without this patches, the pull output result a confusing output:
$ hg pull ../repo-Bob --rev 956063ac4557
pulling from ../repo-Bob
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 0 changes to 2 files (+1 heads)
(2 other changesets obsolete on arrival)
abort: 00changelog.i@956063ac4557828781733b2d5677a351ce856f59: filtered node!
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 05 Apr 2019 15:56:05 +0200 |
parents | 72fdd99eb526 |
children | 57875cf423c9 |
line wrap: on
line source
# 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