Mercurial > public > mercurial-scm > hg-stable
diff mercurial/rcutil.py @ 43075:57875cf423c9
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
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sat, 05 Oct 2019 10:29:34 -0400 |
| parents | edbcf5b239f9 |
| children | 687b865b95ad |
line wrap: on
line diff
--- a/mercurial/rcutil.py Fri Oct 04 15:53:45 2019 -0400 +++ b/mercurial/rcutil.py Sat Oct 05 10:29:34 2019 -0400 @@ -24,15 +24,18 @@ systemrcpath = scmplatform.systemrcpath userrcpath = scmplatform.userrcpath + 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 - return sorted(join(p, f) for f, k in util.listdir(p) - if f.endswith('.rc')) + return sorted( + join(p, f) for f, k in util.listdir(p) if f.endswith('.rc') + ) return [p] + def envrcitems(env=None): '''Return [(section, name, value, source)] config items. @@ -55,6 +58,7 @@ result.append((section, configname, env[envname], '$%s' % envname)) return result + def defaultrcpath(): '''return rc paths in default.d''' path = [] @@ -63,6 +67,7 @@ path = _expandrcpath(defaultpath) return path + def rccomponents(): '''return an ordered [(type, obj)] about where to load configs. @@ -92,6 +97,7 @@ _rccomponents.extend(normpaths(userrcpath())) return _rccomponents + def defaultpagerenv(): '''return a dict of default environment variables and their values, intended to be set before starting a pager.