mercurial/patch.py

34855:35c6a54ec1ff

        buildopts['noprefix'] = get('noprefix', forceplain=False)

    return mdiff.diffopts(**pycompat.strkwargs(buildopts))

def diff(repo, node1=None, node2=None, match=None, changes=None,
         opts=None, losedatafn=None, prefix='', relroot='', copy=None):
    '''yields diff of changes to files between two nodes, or node and
    working directory.

    if node1 is None, use first dirstate parent instead.
    if node2 is None, compare node1 with working directory.

    relroot, if not empty, must be normalized with a trailing /. Any match
    patterns that fall outside it will be ignored.

    copy, if not empty, should contain mappings {dst@y: src@x} of copy
    information.'''
    for fctx1, fctx2, hdr, hunks in diffhunks(
            repo, node1=node1, node2=node2,
            match=match, changes=changes, opts=opts,
            losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy,
    ):
        text = ''.join(sum((list(hlines) for hrange, hlines in hunks), []))
        if hdr and (text or len(hdr) > 1):
            yield '\n'.join(hdr) + '\n'
        if text:
            yield text

34856:890afefa7296

        buildopts['noprefix'] = get('noprefix', forceplain=False)

    return mdiff.diffopts(**pycompat.strkwargs(buildopts))

def diff(repo, node1=None, node2=None, match=None, changes=None,
         opts=None, losedatafn=None, prefix='', relroot='', copy=None,
         hunksfilterfn=None):
    '''yields diff of changes to files between two nodes, or node and
    working directory.

    if node1 is None, use first dirstate parent instead.
    if node2 is None, compare node1 with working directory.

    relroot, if not empty, must be normalized with a trailing /. Any match
    patterns that fall outside it will be ignored.

    copy, if not empty, should contain mappings {dst@y: src@x} of copy
    information.

    hunksfilterfn, if not None, should be a function taking a filectx and
    hunks generator that may yield filtered hunks.
    '''
    for fctx1, fctx2, hdr, hunks in diffhunks(
            repo, node1=node1, node2=node2,
            match=match, changes=changes, opts=opts,
            losedatafn=losedatafn, prefix=prefix, relroot=relroot, copy=copy,
    ):
        if hunksfilterfn is not None:
            hunks = hunksfilterfn(fctx2, hunks)
        text = ''.join(sum((list(hlines) for hrange, hlines in hunks), []))
        if hdr and (text or len(hdr) > 1):
            yield '\n'.join(hdr) + '\n'
        if text:
            yield text