This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7624

rcutil: don't check if defaultrc/ is a directory -- we know it is
ClosedPublic

Authored by martinvonz on Dec 12 2019, 6:44 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG86fe85364811: rcutil: don't check if defaultrc/ is a directory -- we know it is
Summary

mercurial/defaultrc/ is a directory both in the Mercurial repo and
once installed on a target platform. The directory was created in
c4ce077588d0 (config: introduce "built-in" default configuration
settings in default.d, 2014-09-04). That commit has some more
information, but it still doesn't seem to say that defaultrc/ (then
called default.d/) could be a file. Perhaps the check was there to
allow you to run the same code on an older install/repo?

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.Dec 12 2019, 6:44 PM
pulkit added a subscriber: pulkit.Dec 17 2019, 6:48 AM

I am unable to find some code or understand the reasoning behind -- we know this part.

martinvonz added a comment.Dec 17 2019, 8:24 AM
In D7624#112964, @pulkit wrote:

I am unable to find some code or understand the reasoning behind -- we know this part.

defaultrc/ is a directory in the mercurial repo (mercurial/defaultrc/). We also don't convert it to a file when packaging, so it will remain the same directory in an installed mercurial.

martinvonz added a comment.Dec 17 2019, 9:14 AM
In D7624#112995, @martinvonz wrote:
In D7624#112964, @pulkit wrote:

I am unable to find some code or understand the reasoning behind -- we know this part.

defaultrc/ is a directory in the mercurial repo (mercurial/defaultrc/). We also don't convert it to a file when packaging, so it will remain the same directory in an installed mercurial.

I'll add more detail to the commit message in a bit.

pulkit accepted this revision.Dec 17 2019, 11:05 AM
This revision is now accepted and ready to land.Dec 17 2019, 11:05 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/rcutil.py (5 lines)

Diff 18815

mercurial/rcutil.py

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 defaultrc''' '''return rc paths in defaultrc'''
path = []
defaultpath = os.path.join(resourceutil.datapath, b'defaultrc') defaultpath = os.path.join(resourceutil.datapath, b'defaultrc')
if os.path.isdir(defaultpath): return _expandrcpath(defaultpath)
path = _expandrcpath(defaultpath)
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.
respect $HGRCPATH. if $HGRCPATH is empty, only .hg/hgrc of current repo is 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. used. if $HGRCPATH is not set, the platform default will be used.