equal
deleted
inserted
replaced
1562 def get(key, name=None, getter=ui.configbool, forceplain=None): |
1562 def get(key, name=None, getter=ui.configbool, forceplain=None): |
1563 if opts: |
1563 if opts: |
1564 v = opts.get(key) |
1564 v = opts.get(key) |
1565 if v: |
1565 if v: |
1566 return v |
1566 return v |
|
1567 if forceplain is not None and ui.plain(): |
|
1568 return forceplain |
1567 return getter(section, name or key, None, untrusted=untrusted) |
1569 return getter(section, name or key, None, untrusted=untrusted) |
1568 |
1570 |
1569 return mdiff.diffopts( |
1571 return mdiff.diffopts( |
1570 text=opts and opts.get('text'), |
1572 text=opts and opts.get('text'), |
1571 git=get('git'), |
1573 git=get('git'), |