Mercurial > hg
view tests/test-config-env.py @ 34094:5d45a997d11d
rebase: remove complex unhiding code
This is similar to Martin von Zweigbergk's previous patch [1].
Previous patches are adding more `.unfiltered()` to the rebase code. So I
wonder: are we playing whack-a-mole regarding on `unfiltered()` in rebase?
Thinking about it, I believe most of the rebase code *should* just use an
unfiltered repo. The only exception is before we figuring out a
`rebasestate`. This patch makes it so. See added comment in code for why
that's more reasonable.
This would make the code base cleaner (not mangling the `repo` object),
faster (no need to invalidate caches), simpler (less LOC), less error-prone
(no need to think about what to unhide, ex. should we unhide wdir p2? how
about destinations?), and future proof (other code may change visibility in
an unexpected way, ex. directaccess may make the destination only visible
when it's in "--dest" revset tree).
[1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-March/094277.html
Differential Revision: https://phab.mercurial-scm.org/D644
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 06 Sep 2017 16:13:04 -0700 |
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'})