##// END OF EJS Templates
style: run a patched black on a subset of mercurial...
style: run a patched black on a subset of mercurial This applied black to the 20 smallest files in mercurial/: ls -S1 mercurial/*.py | tail -n20 | xargs black --skip-string-normalization Note that a few files failed to format, presumably due to a bug in my patch. The intent is to be able to compare results to D5064 with https://github.com/python/black/pull/826 applied to black. I skipped string normalization on this patch for clarity - in reality I think we'd want one pass without string normalization, followed by another to normalize strings (which is basically replacing ' with " globally.) # skip-blame mass-reformatting only Differential Revision: https://phab.mercurial-scm.org/D6342

File last commit:

r43345:57875cf4 default
r43345:57875cf4 default
Show More
rcutil.py
105 lines | 3.1 KiB | text/x-python | PythonLexer
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 # rcutil.py - utilities about config paths, special config sections etc.
#
# Copyright Mercurial Contributors
#
# 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
import os
from . import (
encoding,
pycompat,
util,
)
Jun Wu
codemod: use pycompat.iswindows...
r34646 if pycompat.iswindows:
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 from . import scmwindows as scmplatform
else:
from . import scmposix as scmplatform
Yuya Nishihara
pager: use less as a fallback on Unix...
r32078 fallbackpager = scmplatform.fallbackpager
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 systemrcpath = scmplatform.systemrcpath
userrcpath = scmplatform.userrcpath
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
rcutil: extract rc directory listing logic...
r31681 def _expandrcpath(path):
'''path could be a file or a directory. return a list of file paths'''
p = util.expandpath(path)
if os.path.isdir(p):
join = os.path.join
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 return sorted(
join(p, f) for f, k in util.listdir(p) if f.endswith('.rc')
)
Jun Wu
rcutil: extract rc directory listing logic...
r31681 return [p]
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
rcutil: add a method to convert environment variables to config items...
r31684 def envrcitems(env=None):
'''Return [(section, name, value, source)] config items.
The config items are extracted from environment variables specified by env,
used to override systemrc, but not userrc.
If env is not provided, encoding.environ will be used.
'''
if env is None:
env = encoding.environ
checklist = [
('EDITOR', 'ui', 'editor'),
('VISUAL', 'ui', 'editor'),
('PAGER', 'pager', 'pager'),
]
result = []
for envname, section, configname in checklist:
if envname not in env:
continue
result.append((section, configname, env[envname], '$%s' % envname))
return result
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
rcutil: split osrcpath to return default.d paths (API)...
r31680 def defaultrcpath():
'''return rc paths in default.d'''
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 path = []
defaultpath = os.path.join(util.datapath, 'default.d')
if os.path.isdir(defaultpath):
Jun Wu
rcutil: extract rc directory listing logic...
r31681 path = _expandrcpath(defaultpath)
Jun Wu
rcutil: move scmutil.*rcpath to rcutil (API)...
r31679 return path
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
rcutil: rename rcpath to rccomponents (API)
r31682 def rccomponents():
Jun Wu
rcutil: let rccomponents return different types of configs (API)...
r31683 '''return an ordered [(type, obj)] about where to load configs.
respect $HGRCPATH. if $HGRCPATH is empty, only .hg/hgrc of current repo is
used. if $HGRCPATH is not set, the platform default will be used.
if a directory is provided, *.rc files under it will be used.
type could be either 'path' or 'items', if type is 'path', obj is a string,
and is the config file path. if type is 'items', obj is a list of (section,
name, value, source) that should fill the config directly.
'''
Jun Wu
rcutil: let environ override system configs (BC)...
r31685 envrc = ('items', envrcitems())
Jun Wu
rcutil: unindent a block...
r31693 if 'HGRCPATH' in encoding.environ:
# assume HGRCPATH is all about user configs so environments can be
# overridden.
_rccomponents = [envrc]
for p in encoding.environ['HGRCPATH'].split(pycompat.ospathsep):
if not p:
continue
_rccomponents.extend(('path', p) for p in _expandrcpath(p))
else:
Jun Wu
rcutil: extract duplicated logic to a lambda...
r31694 normpaths = lambda paths: [('path', os.path.normpath(p)) for p in paths]
_rccomponents = normpaths(defaultrcpath() + systemrcpath())
Jun Wu
rcutil: unindent a block...
r31693 _rccomponents.append(envrc)
Jun Wu
rcutil: extract duplicated logic to a lambda...
r31694 _rccomponents.extend(normpaths(userrcpath()))
Jun Wu
rcutil: rename rcpath to rccomponents (API)
r31682 return _rccomponents
Jun Wu
pager: set some environment variables if they're not set...
r31954
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
Jun Wu
pager: set some environment variables if they're not set...
r31954 def defaultpagerenv():
'''return a dict of default environment variables and their values,
intended to be set before starting a pager.
'''
return {'LESS': 'FRX', 'LV': '-c'}