##// END OF EJS Templates
rcutil: drop the `defaultrcpath()` method (API)...
Matt Harbison -
r44484:2d4cad94 default
parent child Browse files
Show More
@@ -61,12 +61,6 b' def envrcitems(env=None):'
61 return result
61 return result
62
62
63
63
64 def defaultrcpath():
65 '''return rc paths in defaultrc'''
66 defaultpath = os.path.join(resourceutil.datapath, b'defaultrc')
67 return _expandrcpath(defaultpath)
68
69
70 def default_rc_resources():
64 def default_rc_resources():
71 """return rc resource IDs in defaultrc"""
65 """return rc resource IDs in defaultrc"""
72 rsrcs = resourceutil.contents(b'mercurial.defaultrc')
66 rsrcs = resourceutil.contents(b'mercurial.defaultrc')
@@ -107,7 +101,7 b' def rccomponents():'
107 normpaths = lambda paths: [
101 normpaths = lambda paths: [
108 (b'path', os.path.normpath(p)) for p in paths
102 (b'path', os.path.normpath(p)) for p in paths
109 ]
103 ]
110 _rccomponents.extend(normpaths(defaultrcpath() + systemrcpath()))
104 _rccomponents.extend(normpaths(systemrcpath()))
111 _rccomponents.append(envrc)
105 _rccomponents.append(envrc)
112 _rccomponents.extend(normpaths(userrcpath()))
106 _rccomponents.extend(normpaths(userrcpath()))
113 return _rccomponents
107 return _rccomponents
@@ -36,7 +36,6 b' def userrcpath():'
36 return [join(b'userrc')]
36 return [join(b'userrc')]
37
37
38
38
39 extensions.wrapfunction(rcutil, 'defaultrcpath', lambda orig: [])
40 extensions.wrapfunction(rcutil, 'default_rc_resources', lambda orig: [])
39 extensions.wrapfunction(rcutil, 'default_rc_resources', lambda orig: [])
41
40
42 rcutil.systemrcpath = systemrcpath
41 rcutil.systemrcpath = systemrcpath
General Comments 0
You need to be logged in to leave comments. Login now