This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6962

config: add defaults and experimental status for --debug flag
Needs RevisionPublic

Authored by navaneeth.suresh on Oct 4 2019, 3:10 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

This patch adds EXPERIMENTAL to the output of 'showconfig --debug'
for experimental flags which are not under the section == 'experimental'.
This also adds the default value of the config item if it differs from
the current value.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

baymax requested changes to this revision.Jan 24 2020, 12:31 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:31 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (7 lines)
Mmercurial/ui.py (3 lines)
Mtests/test-config.t (8 lines)

Diff 16802

mercurial/commands.py

continue continue
fm.startitem() fm.startitem()
fm.condwrite(ui.debugflag, 'source', '%s: ', source) fm.condwrite(ui.debugflag, 'source', '%s: ', source)
fm.data(defaultvalue=defaultvalue) fm.data(defaultvalue=defaultvalue)
if uniquesel: if uniquesel:
fm.data(name=entryname) fm.data(name=entryname)
fm.write('value', '%s\n', value) fm.write('value', '%s\n', value)
else: else:
if (opts.get('registered') and
value != pycompat.bytestr(defaultvalue) and ui.debugflag):
fm.write('name value defaultvalue', '%s=%s (default: %s)\n',
entryname, value, pycompat.bytestr(defaultvalue))
else:
fm.write('name value', '%s=%s\n', entryname, value) fm.write('name value', '%s=%s\n', entryname, value)
matched = True matched = True
fm.end() fm.end()
if matched: if matched:
return 0 return 0
return 1 return 1
@command('continue', @command('continue',
dryrunopts, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, dryrunopts, helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,

mercurial/ui.py

# Always omit generic config items and those # Always omit generic config items and those
# with dynamicdefault values. # with dynamicdefault values.
if ((section in ['debug', 'devel', 'experimental'] or if ((section in ['debug', 'devel', 'experimental'] or
item.experimental) and not self.verbose): item.experimental) and not self.verbose):
# Omit devel, debug and experimental config items unless # Omit devel, debug and experimental config items unless
# --verbose is specified. # --verbose is specified.
continue continue
value = self._config(section, name, untrusted=untrusted) value = self._config(section, name, untrusted=untrusted)
if self.debugflag:
if item.experimental or 'experimental' in name:
name = ''.join([name, '(EXPERIMENTAL)'])
yield section, name, value yield section, name, value
def plain(self, feature=None): def plain(self, feature=None):
'''is plain mode active? '''is plain mode active?
Plain mode means that all configuration variables which affect Plain mode means that all configuration variables which affect
the behavior and output of Mercurial should be the behavior and output of Mercurial should be
ignored. Additionally, the output should be stable, ignored. Additionally, the output should be stable,

tests/test-config.t

diff.ignorewsamount=False diff.ignorewsamount=False
diff.ignorewseol=False diff.ignorewseol=False
diff.nobinary=False diff.nobinary=False
diff.nodates=False diff.nodates=False
diff.noprefix=False diff.noprefix=False
diff.showfunc=False diff.showfunc=False
diff.unified=None diff.unified=None
diff.word-diff=False diff.word-diff=False
$ hg showconfig --debug --registered | grep 'cmdserver'
none: cmdserver.log=None
none: cmdserver.max-log-files=7
none: cmdserver.max-log-size=1 MB
none: cmdserver.max-repo-cache(EXPERIMENTAL)=0 (default: None)
none: cmdserver.message-encodings(EXPERIMENTAL)=[] (default: None)
none: cmdserver.track-log=[b'chgserver', b'cmdserver', b'repocache']