comparison mercurial/patch.py @ 23295:ac072c79bd9d

patch.diffopts: break get function into if statements

We're going to add another condition here, and with the current structure that
becomes just too confusing.

23294:ec8c73b02e2e

class GitDiffRequired(Exception):
    pass

def diffopts(ui, opts=None, untrusted=False, section='diff'):
    def get(key, name=None, getter=ui.configbool):
        return ((opts and opts.get(key)) or
                getter(section, name or key, None, untrusted=untrusted))
    return mdiff.diffopts(
        text=opts and opts.get('text'),
        git=get('git'),
        nodates=get('nodates'),
        nobinary=get('nobinary'),

23295:ac072c79bd9d

class GitDiffRequired(Exception):
    pass

def diffopts(ui, opts=None, untrusted=False, section='diff'):
    def get(key, name=None, getter=ui.configbool, forceplain=None):
        if opts:
            v = opts.get(key)
            if v:
                return v
        return getter(section, name or key, None, untrusted=untrusted)

    return mdiff.diffopts(
        text=opts and opts.get('text'),
        git=get('git'),
        nodates=get('nodates'),
        nobinary=get('nobinary'),