comparison mercurial/context.py @ 32483:f8fb8a441b4a

annotate: move pair function to top level

We'll want to make this more complicated and have unit tests for it in upcoming
patches.

32482:579df5aaa425

                return ([(rev, i) for i in xrange(1, lines(text) + 1)], text)
        else:
            def decorate(text, rev):
                return ([(rev, False)] * lines(text), text)

        def pair(parent, child):
            blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts)
            for (a1, a2, b1, b2), t in blocks:
                # Changed blocks ('!') or blocks made only of blank lines ('~')
                # belong to the child.
                if t == '=':
                    child[0][b1:b2] = parent[0][a1:a2]
            return child

        getlog = util.lrucachefunc(lambda x: self._repo.file(x))

        def parents(f):
            # Cut _descendantrev here to mitigate the penalty of lazy linkrev
            # adjustment. Otherwise, p._adjustlinkrev() would walk changelog

                    visit.append(p)
            if ready:
                visit.pop()
                curr = decorate(f.data(), f)
                for p in pl:
                    curr = pair(hist[p], curr)
                    if needed[p] == 1:
                        del hist[p]
                        del needed[p]
                    else:
                        needed[p] -= 1

                visit[(parent.linkrev(), parent.filenode())] = parent
            if not visit:
                break
            c = visit.pop(max(visit))
            yield c

class filectx(basefilectx):
    """A filecontext object makes access to data related to a particular
       filerevision convenient."""
    def __init__(self, repo, path, changeid=None, fileid=None,

32483:f8fb8a441b4a

                return ([(rev, i) for i in xrange(1, lines(text) + 1)], text)
        else:
            def decorate(text, rev):
                return ([(rev, False)] * lines(text), text)

        getlog = util.lrucachefunc(lambda x: self._repo.file(x))

        def parents(f):
            # Cut _descendantrev here to mitigate the penalty of lazy linkrev
            # adjustment. Otherwise, p._adjustlinkrev() would walk changelog

                    visit.append(p)
            if ready:
                visit.pop()
                curr = decorate(f.data(), f)
                for p in pl:
                    curr = _annotatepair(hist[p], curr, diffopts)
                    if needed[p] == 1:
                        del hist[p]
                        del needed[p]
                    else:
                        needed[p] -= 1

                visit[(parent.linkrev(), parent.filenode())] = parent
            if not visit:
                break
            c = visit.pop(max(visit))
            yield c

def _annotatepair(parent, child, diffopts):
    blocks = mdiff.allblocks(parent[1], child[1], opts=diffopts)
    for (a1, a2, b1, b2), t in blocks:
        # Changed blocks ('!') or blocks made only of blank lines ('~')
        # belong to the child.
        if t == '=':
            child[0][b1:b2] = parent[0][a1:a2]
    return child

class filectx(basefilectx):
    """A filecontext object makes access to data related to a particular
       filerevision convenient."""
    def __init__(self, repo, path, changeid=None, fileid=None,