diff -r b7a75b9a3386 -r 0407a51b9d8c mercurial/cmdutil.py --- a/mercurial/cmdutil.py Tue Jul 11 08:52:55 2017 -0700 +++ b/mercurial/cmdutil.py Fri Jul 14 14:22:40 2017 -0700 @@ -208,7 +208,7 @@ (see patch.filterpatch). """ usecurses = crecordmod.checkcurses(ui) - testfile = ui.config('experimental', 'crecordtest', None) + testfile = ui.config('experimental', 'crecordtest') oldwrite = setupwrapcolorwrite(ui) try: newchunks, newopts = filterchunks(ui, originalhunks, usecurses, @@ -1687,7 +1687,7 @@ if tmpl: return logtemplatespec(templater.unquotestring(tmpl), None) else: - style = util.expandpath(ui.config('ui', 'style', '')) + style = util.expandpath(ui.config('ui', 'style')) if not tmpl and style: mapfile = style @@ -3406,8 +3406,7 @@ if node != parent: operation = 'revert' reversehunks = repo.ui.configbool('experimental', - 'revertalternateinteractivemode', - True) + 'revertalternateinteractivemode') if reversehunks: diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts) else: