Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/configitems.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 | 85da230c316a |
| children | a936d1368fc5 |
comparison
equal
deleted
inserted
replaced
| 38591:f068495a1c28 | 38592:be441eb65f09 |
|---|---|
| 145 default=False, | 145 default=False, |
| 146 ) | 146 ) |
| 147 coreconfigitem('annotate', 'noprefix', | 147 coreconfigitem('annotate', 'noprefix', |
| 148 default=False, | 148 default=False, |
| 149 ) | 149 ) |
| 150 coreconfigitem('annotate', 'word-diff', | |
| 151 default=False, | |
| 152 ) | |
| 150 coreconfigitem('auth', 'cookiefile', | 153 coreconfigitem('auth', 'cookiefile', |
| 151 default=None, | 154 default=None, |
| 152 ) | 155 ) |
| 153 # bookmarks.pushing: internal hack for discovery | 156 # bookmarks.pushing: internal hack for discovery |
| 154 coreconfigitem('bookmarks', 'pushing', | 157 coreconfigitem('bookmarks', 'pushing', |
| 397 default=False, | 400 default=False, |
| 398 ) | 401 ) |
| 399 coreconfigitem('diff', 'noprefix', | 402 coreconfigitem('diff', 'noprefix', |
| 400 default=False, | 403 default=False, |
| 401 ) | 404 ) |
| 405 coreconfigitem('diff', 'word-diff', | |
| 406 default=False, | |
| 407 ) | |
| 402 coreconfigitem('email', 'bcc', | 408 coreconfigitem('email', 'bcc', |
| 403 default=None, | 409 default=None, |
| 404 ) | 410 ) |
| 405 coreconfigitem('email', 'cc', | 411 coreconfigitem('email', 'cc', |
| 406 default=None, | 412 default=None, |
| 509 coreconfigitem('experimental', 'evolution.report-instabilities', | 515 coreconfigitem('experimental', 'evolution.report-instabilities', |
| 510 default=True, | 516 default=True, |
| 511 ) | 517 ) |
| 512 coreconfigitem('experimental', 'evolution.track-operation', | 518 coreconfigitem('experimental', 'evolution.track-operation', |
| 513 default=True, | 519 default=True, |
| 514 ) | |
| 515 coreconfigitem('experimental', 'worddiff', | |
| 516 default=False, | |
| 517 ) | 520 ) |
| 518 coreconfigitem('experimental', 'maxdeltachainspan', | 521 coreconfigitem('experimental', 'maxdeltachainspan', |
| 519 default=-1, | 522 default=-1, |
| 520 ) | 523 ) |
| 521 coreconfigitem('experimental', 'mergetempdirprefix', | 524 coreconfigitem('experimental', 'mergetempdirprefix', |