This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7426

defaults: rename default.d to defaultrc to make it a valid package name
ClosedPublic

Authored by martinvonz on Nov 15 2019, 12:05 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG02fe8dedab8c: defaults: rename default.d to defaultrc to make it a valid package name
Summary

"default.d" is not a valid Python package name, and it needs to be a
valid package name if we want to be able to load the files from here
as resources.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 15 2019, 12:05 AM
indygreg accepted this revision.Nov 16 2019, 2:02 PM
indygreg added a subscriber: indygreg.

Presumably we'll need a new __init__.py and corresponding package entry in setup.py. But that can come later.

This revision is now accepted and ready to land.Nov 16 2019, 2:02 PM

Revision Contents
Changeset List

Diff 18181

mercurial/default.d/mergetools.rc

  • This file was moved to mercurial/defaultrc/mergetools.rc.

mercurial/defaultrc/mergetools.rc

  • This file was moved from mercurial/default.d/mergetools.rc.

mercurial/rcutil.py

for envname, section, configname in checklist: for envname, section, configname in checklist:
if envname not in env: if envname not in env:
continue continue
result.append((section, configname, env[envname], b'$%s' % envname)) result.append((section, configname, env[envname], b'$%s' % envname))
return result return result
def defaultrcpath(): def defaultrcpath():
'''return rc paths in default.d''' '''return rc paths in defaultrc'''
path = [] path = []
defaultpath = os.path.join(util.datapath, b'default.d') defaultpath = os.path.join(util.datapath, b'defaultrc')
if os.path.isdir(defaultpath): if os.path.isdir(defaultpath):
path = _expandrcpath(defaultpath) path = _expandrcpath(defaultpath)
return path return path
def rccomponents(): def rccomponents():
'''return an ordered [(type, obj)] about where to load configs. '''return an ordered [(type, obj)] about where to load configs.