comparison mercurial/patch.py @ 17944:7ac2a7720724

diff: rewrite diffline

Make diffline more readable, using strings with placeholders
rather than appending to a list from many ifs that makes
difficult to understand the actual output format.

17943:66b9832331c9

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

    def diffline(a, b, revs):
        if repo.ui.quiet and not opts.git:
            return ''
        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()

17944:7ac2a7720724

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

    def diffline(a, b, revs):
        if opts.git:
            line = 'diff --git a/%s b/%s\n' % (a, b)
        elif not repo.ui.quiet:
            if revs:
                revinfo = ' '.join(["-r %s" % rev for rev in revs])
                line = 'diff %s %s\n' % (revinfo, a)
            else:
                line = 'diff %s\n' % a
        else:
            line = ''
        return line

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

    gone = set()