comparison mercurial/context.py @ 32484:c50f29b37aab

annotate: make pair take all parents to pair against

In upcoming patches we'll need to be aware of all parents at the same time.

This also exposes a potential bug: if a line can be annotated with both parents
of a merge commit, it'll always be annotated with p2, not p1. I'm not sure if
that's what we want, but at least the code makes it clear now.

32483:f8fb8a441b4a

                    ready = False
                    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

            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."""

32484:c50f29b37aab

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

            if not visit:
                break
            c = visit.pop(max(visit))
            yield c

def _annotatepair(parents, child, diffopts):
    pblocks = [(parent, mdiff.allblocks(parent[1], child[1], opts=diffopts))
               for parent in parents]
    # Mercurial currently prefers p2 over p1 for annotate.
    # TODO: change this?
    for parent, blocks in pblocks:
        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."""