mercurial/patch.py

17942:5e655418aa8d

            copy, getfilectx, opts, losedatafn, prefix):

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

                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

17943:66b9832331c9

            copy, getfilectx, opts, losedatafn, prefix):

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

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

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