Mercurial > hg
view mercurial/cacheutil.py @ 40790:f07d4f94f098 stable
rebase: preserve working copy when redoing in-mem rebase on disk
When in-memory rebase runs into conflicts, we retry it on disk. But
before we do that, we abort the in-memory rebase. That is done because
even though it's mostly in memory, there are still a few state files
written (e.g. the merge state). We should make it not write those
files so we don't need to abort, but for the stable branch, let's
explicitly clear the state we need to clear instead of running the
usual abort code.
Differential Revision: https://phab.mercurial-scm.org/D5356
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 30 Nov 2018 16:21:37 -0800 |
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