# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 2017-03-27 03:21:32
# Node ID 448889f9a36c490acaac2edd4916f7fd600e2df3
# Parent  0f8ba0bc1154d20e5984cbc671be411aa56d7911

rcutil: split osrcpath to return default.d paths (API)

After this change, there are 3 rcpath functions:

  - defaultrcpath
  - systemrcpath
  - userrcpath

This will allow us to insert another config layer in the middle.

diff --git a/mercurial/rcutil.py b/mercurial/rcutil.py
--- a/mercurial/rcutil.py
+++ b/mercurial/rcutil.py
@@ -24,17 +24,14 @@ else:
 systemrcpath = scmplatform.systemrcpath
 userrcpath = scmplatform.userrcpath
 
-def osrcpath():
-    '''return default os-specific hgrc search path'''
+def defaultrcpath():
+    '''return rc paths in default.d'''
     path = []
     defaultpath = os.path.join(util.datapath, 'default.d')
     if os.path.isdir(defaultpath):
         for f, kind in osutil.listdir(defaultpath):
             if f.endswith('.rc'):
                 path.append(os.path.join(defaultpath, f))
-    path.extend(systemrcpath())
-    path.extend(userrcpath())
-    path = [os.path.normpath(f) for f in path]
     return path
 
 _rcpath = None
@@ -60,5 +57,6 @@ def rcpath():
                 else:
                     _rcpath.append(p)
         else:
-            _rcpath = osrcpath()
+            paths = defaultrcpath() + systemrcpath() + userrcpath()
+            _rcpath = pycompat.maplist(os.path.normpath, paths)
     return _rcpath