##// END OF EJS Templates
status: disable morestatus when using -0...
status: disable morestatus when using -0 Without this patch, you get something like this: ``` M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc) # Unresolved merge conflicts: # # a # # To mark files as resolved: hg resolve --mark FILE # To continue: hg commit # To abort: hg merge --abort ``` That doesn't seem like something one would ever want. I considered making it an error to combine `-0` with morestatus, but it seems very likely that that would just make the user spend time trying to figure out how to disable morestatus, so it feels like we might as well just do it for them. Differential Revision: https://phab.mercurial-scm.org/D9545

File last commit:

r43347:687b865b default
r46696:7a2b67e6 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