mercurial/patch.py

46374:df44bac9413d

import zlib

from .i18n import _
from .node import (
    hex,
    short,
)
from .pycompat import open
from . import (
    copies,

    it and use the file content directly.
    """

    ctx1, fctx1, path1, flag1, content1, date1 = data1
    ctx2, fctx2, path2, flag2, content2, date2 = data2
    if binary and opts.git and not opts.nobinary:
        text = mdiff.b85diff(content1, content2)
        if text:
            header.append(
                b'index %s..%s' % (_gitindex(content1), _gitindex(content2))
            )
        hunks = ((None, [text]),)
    else:
        if opts.git and opts.index > 0:
            flag = flag1
            if flag is None:
                flag = flag2
            header.append(
                b'index %s..%s %s'
                % (
                    _gitindex(content1)[0 : opts.index],
                    _gitindex(content2)[0 : opts.index],
                    _gitmode[flag],
                )
            )

        uheaders, hunks = mdiff.unidiff(

46375:33350debb480

import zlib

from .i18n import _
from .node import (
    hex,
    nullhex,
    short,
)
from .pycompat import open
from . import (
    copies,

    it and use the file content directly.
    """

    ctx1, fctx1, path1, flag1, content1, date1 = data1
    ctx2, fctx2, path2, flag2, content2, date2 = data2
    index1 = _gitindex(content1) if path1 in ctx1 else nullhex
    index2 = _gitindex(content2) if path2 in ctx2 else nullhex
    if binary and opts.git and not opts.nobinary:
        text = mdiff.b85diff(content1, content2)
        if text:
            header.append(
                b'index %s..%s' % (index1, index2)
            )
        hunks = ((None, [text]),)
    else:
        if opts.git and opts.index > 0:
            flag = flag1
            if flag is None:
                flag = flag2
            header.append(
                b'index %s..%s %s'
                % (
                    index1[0 : opts.index],
                    index2[0 : opts.index],
                    _gitmode[flag],
                )
            )

        uheaders, hunks = mdiff.unidiff(