##// END OF EJS Templates
rebase: teach in-memory rebase to not restart with on-disk rebase on conflict...
rebase: teach in-memory rebase to not restart with on-disk rebase on conflict When in-memory rebase runs into conflicts, it redoes the whole rebase operation. This patch teaches it to instead discard just the current `overlayworkingctx` and redo that node on disk. I've tested this by enabling in-memory rebase by default and checking that there are no unexpected differences after this patch. The next step is to make it so that `hg rebase --continue` can use in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D9076

File last commit:

r43347:687b865b default
r46132:feffeb18 default
Show More
cacheutil.py
22 lines | 822 B | text/x-python | PythonLexer
Boris Feld
caches: make 'cachetocopy' available in scmutil...
r35784 # 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
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Boris Feld
caches: make 'cachetocopy' available in scmutil...
r35784 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.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 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']
Boris Feld
caches: make 'cachetocopy' available in scmutil...
r35784 return cachefiles