##// END OF EJS Templates
config: invert evolution-related configuration aliases...
Boris Feld -
r34864:b1e3f609 default
parent child Browse files
Show More
@@ -1239,7 +1239,7 b' def bundle(ui, repo, fname, dest=None, *'
1239
1239
1240
1240
1241 contentopts = {'cg.version': cgversion}
1241 contentopts = {'cg.version': cgversion}
1242 if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'):
1242 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1243 contentopts['obsolescence'] = True
1243 contentopts['obsolescence'] = True
1244 if repo.ui.configbool('experimental', 'bundle-phases'):
1244 if repo.ui.configbool('experimental', 'bundle-phases'):
1245 contentopts['phases'] = True
1245 contentopts['phases'] = True
@@ -345,6 +345,18 b" coreconfigitem('experimental', 'crecordt"
345 coreconfigitem('experimental', 'editortmpinhg',
345 coreconfigitem('experimental', 'editortmpinhg',
346 default=False,
346 default=False,
347 )
347 )
348 coreconfigitem('experimental', 'evolution',
349 default=list,
350 alias=[('experimental', 'stabilization')],
351 )
352 coreconfigitem('experimental', 'evolution.bundle-obsmarker',
353 default=False,
354 alias=[('experimental', 'stabilization.bundle-obsmarker')],
355 )
356 coreconfigitem('experimental', 'evolution.track-operation',
357 default=True,
358 alias=[('experimental', 'stabilization.track-operation')]
359 )
348 coreconfigitem('experimental', 'maxdeltachainspan',
360 coreconfigitem('experimental', 'maxdeltachainspan',
349 default=-1,
361 default=-1,
350 )
362 )
@@ -357,18 +369,6 b" coreconfigitem('experimental', 'nonnorma"
357 coreconfigitem('experimental', 'effect-flags',
369 coreconfigitem('experimental', 'effect-flags',
358 default=False,
370 default=False,
359 )
371 )
360 coreconfigitem('experimental', 'stabilization',
361 default=list,
362 alias=[('experimental', 'evolution')],
363 )
364 coreconfigitem('experimental', 'stabilization.bundle-obsmarker',
365 default=False,
366 alias=[('experimental', 'evolution.bundle-obsmarker')],
367 )
368 coreconfigitem('experimental', 'stabilization.track-operation',
369 default=True,
370 alias=[('experimental', 'evolution.track-operation')]
371 )
372 coreconfigitem('experimental', 'exportableenviron',
372 coreconfigitem('experimental', 'exportableenviron',
373 default=list,
373 default=list,
374 )
374 )
@@ -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', 'stabilization'))
105 result = set(repo.ui.configlist('experimental', 'evolution'))
106 if 'all' in result:
106 if 'all' in result:
107 return True
107 return True
108
108
@@ -1043,7 +1043,7 b' def createmarkers(repo, relations, flag='
1043
1043
1044 # Operation metadata handling
1044 # Operation metadata handling
1045 useoperation = repo.ui.configbool('experimental',
1045 useoperation = repo.ui.configbool('experimental',
1046 'stabilization.track-operation')
1046 'evolution.track-operation')
1047 if useoperation and operation:
1047 if useoperation and operation:
1048 metadata['operation'] = operation
1048 metadata['operation'] = operation
1049
1049
General Comments 0
You need to be logged in to leave comments. Login now