##// END OF EJS Templates
config: rename evolution config into stabilization...
Boris Feld -
r33767:d434a7f0 default
parent child Browse files
Show More
@@ -1227,7 +1227,7 b' def bundle(ui, repo, fname, dest=None, *'
1227
1227
1228
1228
1229 contentopts = {'cg.version': cgversion}
1229 contentopts = {'cg.version': cgversion}
1230 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1230 if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'):
1231 contentopts['obsolescence'] = True
1231 contentopts['obsolescence'] = True
1232 if repo.ui.configbool('experimental', 'bundle-phases'):
1232 if repo.ui.configbool('experimental', 'bundle-phases'):
1233 contentopts['phases'] = True
1233 contentopts['phases'] = True
@@ -181,14 +181,17 b" coreconfigitem('experimental', 'disablec"
181 coreconfigitem('experimental', 'editortmpinhg',
181 coreconfigitem('experimental', 'editortmpinhg',
182 default=False,
182 default=False,
183 )
183 )
184 coreconfigitem('experimental', 'evolution',
184 coreconfigitem('experimental', 'stabilization',
185 default=list,
185 default=list,
186 alias=[('experimental', 'evolution')],
186 )
187 )
187 coreconfigitem('experimental', 'evolution.bundle-obsmarker',
188 coreconfigitem('experimental', 'stabilization.bundle-obsmarker',
188 default=False,
189 default=False,
190 alias=[('experimental', 'evolution.bundle-obsmarker')],
189 )
191 )
190 coreconfigitem('experimental', 'evolution.track-operation',
192 coreconfigitem('experimental', 'stabilization.track-operation',
191 default=False,
193 default=False,
194 alias=[('experimental', 'evolution.track-operation')]
192 )
195 )
193 coreconfigitem('experimental', 'exportableenviron',
196 coreconfigitem('experimental', 'exportableenviron',
194 default=list,
197 default=list,
@@ -102,7 +102,7 b' def isenabled(repo, option):'
102 """Returns True if the given repository has the given obsolete option
102 """Returns True if the given repository has the given obsolete option
103 enabled.
103 enabled.
104 """
104 """
105 result = set(repo.ui.configlist('experimental', 'evolution'))
105 result = set(repo.ui.configlist('experimental', 'stabilization'))
106 if 'all' in result:
106 if 'all' in result:
107 return True
107 return True
108
108
@@ -1007,7 +1007,7 b' def createmarkers(repo, relations, flag='
1007 if 'user' not in metadata:
1007 if 'user' not in metadata:
1008 metadata['user'] = repo.ui.username()
1008 metadata['user'] = repo.ui.username()
1009 useoperation = repo.ui.configbool('experimental',
1009 useoperation = repo.ui.configbool('experimental',
1010 'evolution.track-operation')
1010 'stabilization.track-operation')
1011 if useoperation and operation:
1011 if useoperation and operation:
1012 metadata['operation'] = operation
1012 metadata['operation'] = operation
1013 tr = repo.transaction('add-obsolescence-marker')
1013 tr = repo.transaction('add-obsolescence-marker')
General Comments 0
You need to be logged in to leave comments. Login now