Show More
@@ -1559,9 +1559,13 b' class GitDiffRequired(Exception):' | |||||
1559 | pass |
|
1559 | pass | |
1560 |
|
1560 | |||
1561 | def diffopts(ui, opts=None, untrusted=False, section='diff'): |
|
1561 | def diffopts(ui, opts=None, untrusted=False, section='diff'): | |
1562 | def get(key, name=None, getter=ui.configbool): |
|
1562 | def get(key, name=None, getter=ui.configbool, forceplain=None): | |
1563 | return ((opts and opts.get(key)) or |
|
1563 | if opts: | |
1564 | getter(section, name or key, None, untrusted=untrusted)) |
|
1564 | v = opts.get(key) | |
|
1565 | if v: | |||
|
1566 | return v | |||
|
1567 | return getter(section, name or key, None, untrusted=untrusted) | |||
|
1568 | ||||
1565 | return mdiff.diffopts( |
|
1569 | return mdiff.diffopts( | |
1566 | text=opts and opts.get('text'), |
|
1570 | text=opts and opts.get('text'), | |
1567 | git=get('git'), |
|
1571 | git=get('git'), |
General Comments 0
You need to be logged in to leave comments.
Login now