Mercurial > hg
view tests/test-ui-verbosity.py @ 45545:e5e1285b6f6f
largefiles: prevent in-memory merge instead of switching to on-disk
I enabled in-memory merge by default while testing some changes. I
spent quite some time troubleshooting why largefiles was still
creating an on-disk mergestate. Then I found out that it ignores the
callers `wc` argument to `mergemod._update()` and always uses on-disk
merge. This patch changes that so we raise an error if largefiles is
used with in-memory merge. That way we'll notice if in-memory merge is
used with largefiles instead of silently replacing ignoring the
`overlayworkingctx` instance and updating the working copy instead.
I felt a little bad that this would break things more for users with
both largefiles and in-memory rebase enabled. So I also added a
higher-level override to make sure that largefiles disables in-memory
rebase. It turns out that that fixes `run-tests.py -k largefiles
--extra-config-opt rebase.experimental.inmemory=1`.
Differential Revision: https://phab.mercurial-scm.org/D9069
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 22 Sep 2020 23:18:37 -0700 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
line wrap: on
line source
from __future__ import absolute_import, print_function import os from mercurial import ( pycompat, ui as uimod, ) if pycompat.ispy3: xrange = range hgrc = os.environ['HGRCPATH'] f = open(hgrc) basehgrc = f.read() f.close() print(' hgrc settings command line options final result ') print(' quiet verbo debug quiet verbo debug quiet verbo debug') for i in xrange(64): hgrc_quiet = bool(i & 1 << 0) hgrc_verbose = bool(i & 1 << 1) hgrc_debug = bool(i & 1 << 2) cmd_quiet = bool(i & 1 << 3) cmd_verbose = bool(i & 1 << 4) cmd_debug = bool(i & 1 << 5) f = open(hgrc, 'w') f.write(basehgrc) f.write('\n[ui]\n') if hgrc_quiet: f.write('quiet = True\n') if hgrc_verbose: f.write('verbose = True\n') if hgrc_debug: f.write('debug = True\n') f.close() u = uimod.ui.load() if cmd_quiet or cmd_debug or cmd_verbose: u.setconfig(b'ui', b'quiet', pycompat.bytestr(bool(cmd_quiet))) u.setconfig(b'ui', b'verbose', pycompat.bytestr(bool(cmd_verbose))) u.setconfig(b'ui', b'debug', pycompat.bytestr(bool(cmd_debug))) check = '' if u.debugflag: if not u.verbose or u.quiet: check = ' *' elif u.verbose and u.quiet: check = ' +' print( ( '%2d %5s %5s %5s %5s %5s %5s -> %5s %5s %5s%s' % ( i, hgrc_quiet, hgrc_verbose, hgrc_debug, cmd_quiet, cmd_verbose, cmd_debug, u.quiet, u.verbose, u.debugflag, check, ) ) )