comparison mercurial/patch.py @ 23752:70d8be6299ab

trydiff: make addindexmeta() unconditionally add index meta

The conditional-ness is not clear from the name and there is only one
caller, so it's clearer to check on the call site. Moving it also
makes addindexmeta() no longer close on the 'opts' variable.

23751:30c6e85aac77

        if omode != nmode:
            header.append('old mode %s\n' % omode)
            header.append('new mode %s\n' % nmode)

    def addindexmeta(meta, oindex, nindex):
        if opts.git:
            meta.append('index %s..%s\n' % (oindex, nindex))

    def gitindex(text):
        if not text:
            text = ""
        l = len(text)

        if dodiff:
            if opts.git or revs:
                header.insert(0, diffline(join(a), join(b), revs))
            if dodiff == 'binary' and not opts.nobinary:
                text = mdiff.b85diff(to, tn)
                if text:
                    addindexmeta(header, gitindex(to), gitindex(tn))
            else:
                text = mdiff.unidiff(to, date1,
                                     tn, date2,
                                     join(a), join(b), opts=opts)

23752:70d8be6299ab

        if omode != nmode:
            header.append('old mode %s\n' % omode)
            header.append('new mode %s\n' % nmode)

    def addindexmeta(meta, oindex, nindex):
        meta.append('index %s..%s\n' % (oindex, nindex))

    def gitindex(text):
        if not text:
            text = ""
        l = len(text)

        if dodiff:
            if opts.git or revs:
                header.insert(0, diffline(join(a), join(b), revs))
            if dodiff == 'binary' and not opts.nobinary:
                text = mdiff.b85diff(to, tn)
                if text and opts.git:
                    addindexmeta(header, gitindex(to), gitindex(tn))
            else:
                text = mdiff.unidiff(to, date1,
                                     tn, date2,
                                     join(a), join(b), opts=opts)