comparison mercurial/patch.py @ 23432:27af986a332b

patch.difffeatureopts: add a feature for diff.git

This deserves to be its own feature -- indeed, this is often the only feature
several commands care about.

23431:10223d2278f4

    '''return diffopts with all features supported and parsed'''
    return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section)

diffopts = diffallopts

def difffeatureopts(ui, opts=None, untrusted=False, section='diff'):
    '''return diffopts with only opted-in features parsed'''
    def get(key, name=None, getter=ui.configbool, forceplain=None):
        if opts:
            v = opts.get(key)
            if v:
                return v

            return forceplain
        return getter(section, name or key, None, untrusted=untrusted)

    buildopts = {
        'text': opts and opts.get('text'),
        'git': get('git'),
        'nodates': get('nodates'),
        'nobinary': get('nobinary'),
        'noprefix': get('noprefix', forceplain=False),
        'showfunc': get('show_function', 'showfunc'),
        'ignorews': get('ignore_all_space', 'ignorews'),
        'ignorewsamount': get('ignore_space_change', 'ignorewsamount'),
        'ignoreblanklines': get('ignore_blank_lines', 'ignoreblanklines'),
        'context': get('unified', getter=ui.config),
    }

    return mdiff.diffopts(**buildopts)

def diff(repo, node1=None, node2=None, match=None, changes=None, opts=None,
         losedatafn=None, prefix=''):

23432:27af986a332b

    '''return diffopts with all features supported and parsed'''
    return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section)

diffopts = diffallopts

def difffeatureopts(ui, opts=None, untrusted=False, section='diff', git=False):
    '''return diffopts with only opted-in features parsed

    Features:
    - git: git-style diffs
    '''
    def get(key, name=None, getter=ui.configbool, forceplain=None):
        if opts:
            v = opts.get(key)
            if v:
                return v

            return forceplain
        return getter(section, name or key, None, untrusted=untrusted)

    buildopts = {
        'text': opts and opts.get('text'),
        'nodates': get('nodates'),
        'nobinary': get('nobinary'),
        'noprefix': get('noprefix', forceplain=False),
        'showfunc': get('show_function', 'showfunc'),
        'ignorews': get('ignore_all_space', 'ignorews'),
        'ignorewsamount': get('ignore_space_change', 'ignorewsamount'),
        'ignoreblanklines': get('ignore_blank_lines', 'ignoreblanklines'),
        'context': get('unified', getter=ui.config),
    }

    if git:
        buildopts['git'] = get('git')

    return mdiff.diffopts(**buildopts)

def diff(repo, node1=None, node2=None, match=None, changes=None, opts=None,
         losedatafn=None, prefix=''):