D7426: defaults: rename default.d to defaultrc to make it a valid package name
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Nov 15 05:05:29 UTC 2019
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D7426
AFFECTED FILES
mercurial/default.d/mergetools.rc
mercurial/defaultrc/mergetools.rc
mercurial/rcutil.py
CHANGE DETAILS
diff --git a/mercurial/rcutil.py b/mercurial/rcutil.py
--- a/mercurial/rcutil.py
+++ b/mercurial/rcutil.py
@@ -60,9 +60,9 @@
def defaultrcpath():
- '''return rc paths in default.d'''
+ '''return rc paths in defaultrc'''
path = []
- defaultpath = os.path.join(util.datapath, b'default.d')
+ defaultpath = os.path.join(util.datapath, b'defaultrc')
if os.path.isdir(defaultpath):
path = _expandrcpath(defaultpath)
return path
diff --git a/mercurial/default.d/mergetools.rc b/mercurial/defaultrc/mergetools.rc
rename from mercurial/default.d/mergetools.rc
rename to mercurial/defaultrc/mergetools.rc
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list