Mercurial > public > mercurial-scm > hg-stable
diff mercurial/diffutil.py @ 38592:be441eb65f09
diff: graduate word-diff option from experimental
Per 4.6 Sprint notes.
I've also made it gated by "formatchanging" since it could change the output
if we had an option to highlight words without using colors.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 08 Jul 2018 16:21:26 +0900 |
| parents | 1c93e0237a24 |
| children | 78b270a55dc6 |
line wrap: on
line diff
--- a/mercurial/diffutil.py Fri Jul 06 12:47:02 2018 -0700 +++ b/mercurial/diffutil.py Sun Jul 08 16:21:26 2018 +0900 @@ -53,7 +53,6 @@ 'showfunc': get('show_function', 'showfunc'), 'context': get('unified', getter=ui.config), } - buildopts['worddiff'] = ui.configbool('experimental', 'worddiff') buildopts['xdiff'] = ui.configbool('experimental', 'xdiff') if git: @@ -101,5 +100,6 @@ buildopts['nobinary'] = (not binary if binary is not None else get('nobinary', forceplain=False)) buildopts['noprefix'] = get('noprefix', forceplain=False) + buildopts['worddiff'] = get('word_diff', 'word-diff', forceplain=False) return mdiff.diffopts(**pycompat.strkwargs(buildopts))