comparison mercurial/patch.py @ 17941:9a6e4d5d7ea8

diff: move diffline to patch module

diffline is not part of diff computation, so it makes more sense
to place it with other header generation in patch module.

In upcoming patches we will generalize this approach for
all headers added in the patch, including the git index
header.

17940:c84ef0047a94

def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
            copy, getfilectx, opts, losedatafn, prefix):

    def join(f):
        return os.path.join(prefix, f)

    date1 = util.datestr(ctx1.date())
    man1 = ctx1.manifest()

    gone = set()

                elif binary or nflag != oflag:
                    losedatafn(f)

        if dodiff:
            if opts.git or revs:
                header.insert(0, mdiff.diffline(revs, join(a), join(b), opts))
            if dodiff == 'binary':
                text = mdiff.b85diff(to, tn)
            else:
                text = mdiff.unidiff(to, date1,
                                    # ctx2 date may be dynamic

17941:9a6e4d5d7ea8

def trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
            copy, getfilectx, opts, losedatafn, prefix):

    def join(f):
        return os.path.join(prefix, f)

    def diffline(revs, a, b, opts):
        parts = ['diff']
        if opts.git:
            parts.append('--git')
        if revs and not opts.git:
            parts.append(' '.join(["-r %s" % rev for rev in revs]))
        if opts.git:
            parts.append('a/%s' % a)
            parts.append('b/%s' % b)
        else:
            parts.append(a)
        return ' '.join(parts) + '\n'

    date1 = util.datestr(ctx1.date())
    man1 = ctx1.manifest()

    gone = set()

                elif binary or nflag != oflag:
                    losedatafn(f)

        if dodiff:
            if opts.git or revs:
                header.insert(0, diffline(revs, join(a), join(b), opts))
            if dodiff == 'binary':
                text = mdiff.b85diff(to, tn)
            else:
                text = mdiff.unidiff(to, date1,
                                    # ctx2 date may be dynamic