Mercurial > hg
view tests/test-config-env.py @ 35410:83014fa95435
rebase: fix for hgsubversion
5c25fe7fb1e broke something in the hgsubversion test path, causing it raise an
abort (Abort: nothing to merge) during a perfectly good rebase. I tracked it
down to this change. It's probably not hgsubversion related.
I suspect that using the same `wctx` from before the initial update causes
problems with the wctx's cached manifest property. I noticed we also sometimes
stick random gunk on the wctx object in other places (like in `copies.py`) so
it's probably best to reset it for now.
The line I added before was actually useless since we don't pass wctx to the
initial `merge.update`, so it defaults to `repo[None]`. So I just removed it.
Differential Revision: https://phab.mercurial-scm.org/D1679
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Tue, 12 Dec 2017 22:05:21 -0800 |
parents | 08fbc97d1364 |
children | a22915edc279 |
line wrap: on
line source
# Test the config layer generated by environment variables from __future__ import absolute_import, print_function import os from mercurial import ( encoding, rcutil, ui as uimod, util, ) testtmp = encoding.environ['TESTTMP'] # prepare hgrc files def join(name): return os.path.join(testtmp, name) with open(join('sysrc'), 'w') as f: f.write('[ui]\neditor=e0\n[pager]\npager=p0\n') with open(join('userrc'), 'w') as f: f.write('[ui]\neditor=e1') # replace rcpath functions so they point to the files above def systemrcpath(): return [join('sysrc')] def userrcpath(): return [join('userrc')] rcutil.systemrcpath = systemrcpath rcutil.userrcpath = userrcpath os.path.isdir = lambda x: False # hack: do not load default.d/*.rc # utility to print configs def printconfigs(env): encoding.environ = env rcutil._rccomponents = None # reset cache ui = uimod.ui.load() for section, name, value in ui.walkconfig(): source = ui.configsource(section, name) print('%s.%s=%s # %s' % (section, name, value, util.pconvert(source))) print('') # environment variable overrides printconfigs({}) printconfigs({'EDITOR': 'e2', 'PAGER': 'p2'})