comparison mercurial/patch.py @ 17942:5e655418aa8d

diff: change how quiet mode supresses diffline

Before, quiet mode produced no diffline header for mercurial as a
side effect of not populating "revs". This was a weird side effect,
and we will always need revs for git index header that will be added
in upcoming patches, so now we just check ui.quiet from diffline
directly.

17941:9a6e4d5d7ea8

    if not modified and not added and not removed:
        return []

    revs = None
    if not repo.ui.quiet:
        hexfunc = repo.ui.debugflag and hex or short
        revs = [hexfunc(node) for node in [node1, node2] if node]

    copy = {}
    if opts.git or opts.upgrade:
        copy = copies.pathcopies(ctx1, ctx2)

    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]))

17942:5e655418aa8d

    if not modified and not added and not removed:
        return []

    revs = None
    hexfunc = repo.ui.debugflag and hex or short
    revs = [hexfunc(node) for node in [node1, node2] if node]

    copy = {}
    if opts.git or opts.upgrade:
        copy = copies.pathcopies(ctx1, ctx2)

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

    def diffline(revs, a, b, opts):
        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]))