comparison mercurial/patch.py @ 31271:b3861be6aa6c

mdiff: distinguish diff headers from hunks in unidiff()

Let unidiff return the list of headers it produces (lines '--- <original>' and
'+++ <new>') apart from diff hunks. In patch.diff(), we combine headers
generated there (not specific to unified format) with those from unidiff().
By returning a list of header lines, we do not append new lines in datetag
inner function of unidiff() so that all header lines are '\n'.join-ed in a
similar way.

31270:59aec562a50b

                header.append('index %s..%s %s' %
                              (gitindex(content1)[0:opts.index],
                               gitindex(content2)[0:opts.index],
                               gitmode[flag]))

            text = mdiff.unidiff(content1, date1,
                                 content2, date2,
                                 path1, path2, opts=opts)
        if header and (text or len(header) > 1):
            yield '\n'.join(header) + '\n'
        if text:
            yield text

31271:b3861be6aa6c

                header.append('index %s..%s %s' %
                              (gitindex(content1)[0:opts.index],
                               gitindex(content2)[0:opts.index],
                               gitmode[flag]))

            uheaders, text = mdiff.unidiff(content1, date1,
                                           content2, date2,
                                           path1, path2, opts=opts)
            header.extend(uheaders)
        if header and (text or len(header) > 1):
            yield '\n'.join(header) + '\n'
        if text:
            yield text