Mercurial > hg
view tests/test-ui-verbosity.py @ 39127:95bd19f60957
overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)
If there was a metadata-only mutation, such as +x or -x on a file, we would
create a cache entry with None for data, and this would cause problems later on
when some code tried to run fctx.data() or similar, and was expecting a string.
My original fix for this involved passing data=self._wrappedctx[path].data() in
setflags(), but this version seems slightly better - this way, if we ever call
write() and then call setflags(), we don't destroy the data that we wrote that's
in the cache. I haven't verified that other fields aren't destroyed, such as
date or flags :)
Differential Revision: https://phab.mercurial-scm.org/D4287
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Wed, 15 Aug 2018 17:40:21 -0700 |
parents | 76d0a343c305 |
children | 2372284d9457 |
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)))