Use aliases for backward-compatibility. Though I'm not sure how to emit
compatibility warnings with aliases.
Test configuration are updated in the next patch.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
( )
hg-reviewers |
Use aliases for backward-compatibility. Though I'm not sure how to emit
compatibility warnings with aliases.
Test configuration are updated in the next patch.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Automatic diff as part of commit; lint not applicable. |
Automatic diff as part of commit; unit tests not applicable. |
Path | Packages | |||
---|---|---|---|---|
M | mercurial/commands.py (2 lines) | |||
M | mercurial/configitems.py (9 lines) | |||
M | mercurial/obsolete.py (4 lines) |
Status | Author | Revision | |
---|---|---|---|
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan | ||
Closed | lothiraldan |
# b) introducing a command flag. | # b) introducing a command flag. | ||||
compopts = {} | compopts = {} | ||||
complevel = ui.configint('experimental', 'bundlecomplevel') | complevel = ui.configint('experimental', 'bundlecomplevel') | ||||
if complevel is not None: | if complevel is not None: | ||||
compopts['level'] = complevel | compopts['level'] = complevel | ||||
contentopts = {'cg.version': cgversion} | contentopts = {'cg.version': cgversion} | ||||
if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): | if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'): | ||||
contentopts['obsolescence'] = True | contentopts['obsolescence'] = True | ||||
if repo.ui.configbool('experimental', 'bundle-phases'): | if repo.ui.configbool('experimental', 'bundle-phases'): | ||||
contentopts['phases'] = True | contentopts['phases'] = True | ||||
bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, | ||||
contentopts, compression=bcompression, | contentopts, compression=bcompression, | ||||
compopts=compopts) | compopts=compopts) | ||||
@command('cat', | @command('cat', |
default=None, | default=None, | ||||
) | ) | ||||
coreconfigitem('experimental', 'disablecopytrace', | coreconfigitem('experimental', 'disablecopytrace', | ||||
default=False, | default=False, | ||||
) | ) | ||||
coreconfigitem('experimental', 'editortmpinhg', | coreconfigitem('experimental', 'editortmpinhg', | ||||
default=False, | default=False, | ||||
) | ) | ||||
coreconfigitem('experimental', 'evolution', | coreconfigitem('experimental', 'stabilization', | ||||
default=list, | default=list, | ||||
alias=[('experimental', 'evolution')], | |||||
) | ) | ||||
coreconfigitem('experimental', 'evolution.bundle-obsmarker', | coreconfigitem('experimental', 'stabilization.bundle-obsmarker', | ||||
default=False, | default=False, | ||||
alias=[('experimental', 'evolution.bundle-obsmarker')], | |||||
) | ) | ||||
coreconfigitem('experimental', 'evolution.track-operation', | coreconfigitem('experimental', 'stabilization.track-operation', | ||||
default=False, | default=False, | ||||
alias=[('experimental', 'evolution.track-operation')] | |||||
) | ) | ||||
coreconfigitem('experimental', 'exportableenviron', | coreconfigitem('experimental', 'exportableenviron', | ||||
default=list, | default=list, | ||||
) | ) | ||||
coreconfigitem('experimental', 'extendedheader.index', | coreconfigitem('experimental', 'extendedheader.index', | ||||
default=None, | default=None, | ||||
) | ) | ||||
coreconfigitem('experimental', 'extendedheader.similarity', | coreconfigitem('experimental', 'extendedheader.similarity', |
createmarkersopt = 'createmarkers' | createmarkersopt = 'createmarkers' | ||||
allowunstableopt = 'allowunstable' | allowunstableopt = 'allowunstable' | ||||
exchangeopt = 'exchange' | exchangeopt = 'exchange' | ||||
def isenabled(repo, option): | def isenabled(repo, option): | ||||
"""Returns True if the given repository has the given obsolete option | """Returns True if the given repository has the given obsolete option | ||||
enabled. | enabled. | ||||
""" | """ | ||||
result = set(repo.ui.configlist('experimental', 'evolution')) | result = set(repo.ui.configlist('experimental', 'stabilization')) | ||||
if 'all' in result: | if 'all' in result: | ||||
return True | return True | ||||
# For migration purposes, temporarily return true if the config hasn't been | # For migration purposes, temporarily return true if the config hasn't been | ||||
# set but _enabled is true. | # set but _enabled is true. | ||||
if len(result) == 0 and _enabled: | if len(result) == 0 and _enabled: | ||||
return True | return True | ||||
not take any lock on the repo. | not take any lock on the repo. | ||||
""" | """ | ||||
# prepare metadata | # prepare metadata | ||||
if metadata is None: | if metadata is None: | ||||
metadata = {} | metadata = {} | ||||
if 'user' not in metadata: | if 'user' not in metadata: | ||||
metadata['user'] = repo.ui.username() | metadata['user'] = repo.ui.username() | ||||
useoperation = repo.ui.configbool('experimental', | useoperation = repo.ui.configbool('experimental', | ||||
'evolution.track-operation') | 'stabilization.track-operation') | ||||
if useoperation and operation: | if useoperation and operation: | ||||
metadata['operation'] = operation | metadata['operation'] = operation | ||||
tr = repo.transaction('add-obsolescence-marker') | tr = repo.transaction('add-obsolescence-marker') | ||||
try: | try: | ||||
markerargs = [] | markerargs = [] | ||||
for rel in relations: | for rel in relations: | ||||
prec = rel[0] | prec = rel[0] | ||||
sucs = rel[1] | sucs = rel[1] |