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

login
register
mail settings
Submitter phabricator
Date Nov. 16, 2019, 7:22 p.m.
Message ID <14bbc1307ee6d8426a5489eff3f20789@localhost.localdomain>
Download mbox | patch
Permalink /patch/43305/
State Not Applicable
Headers show

Comments

phabricator - Nov. 16, 2019, 7:22 p.m.
Closed by commit rHG02fe8dedab8c: defaults: rename default.d to defaultrc to make it a valid package name (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7426?vs=18150&id=18181

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7426/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7426

AFFECTED FILES
  mercurial/default.d/mergetools.rc
  mercurial/defaultrc/mergetools.rc
  mercurial/rcutil.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel

Patch

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