comparison mercurial/context.py @ 30824:6e1d54be7588

context: extract _changesinrange() out of blockancestors()

We'll need it to write a blockdescendants function in next changeset.

30823:806a830e6612

        # hard for renames
        c = self._filelog.children(self._filenode)
        return [filectx(self._repo, self._path, fileid=x,
                        filelog=self._filelog) for x in c]

def blockancestors(fctx, fromline, toline):
    """Yield ancestors of `fctx` with respect to the block of lines within
    `fromline`-`toline` range.
    """
    def changesrange(fctx1, fctx2, linerange2):
        """Return `(diffinrange, linerange1)` where `diffinrange` is True
        if diff from fctx2 to fctx1 has changes in linerange2 and
        `linerange1` is the new line range for fctx1.
        """
        diffopts = patch.diffopts(fctx._repo.ui)
        blocks = mdiff.allblocks(fctx1.data(), fctx2.data(), diffopts)
        filteredblocks, linerange1 = mdiff.blocksinrange(blocks, linerange2)
        diffinrange = any(stype == '!' for _, stype in filteredblocks)
        return diffinrange, linerange1

    visit = {(fctx.linkrev(), fctx.filenode()): (fctx, (fromline, toline))}
    while visit:
        c, linerange2 = visit.pop(max(visit))
        pl = c.parents()
        if not pl:
            # The block originates from the initial revision.
            yield c
            continue
        inrange = False
        for p in pl:
            inrangep, linerange1 = changesrange(p, c, linerange2)
            inrange = inrange or inrangep
            if linerange1[0] == linerange1[1]:
                # Parent's linerange is empty, meaning that the block got
                # introduced in this revision; no need to go futher in this
                # branch.

30824:6e1d54be7588

        # hard for renames
        c = self._filelog.children(self._filenode)
        return [filectx(self._repo, self._path, fileid=x,
                        filelog=self._filelog) for x in c]

def _changesrange(fctx1, fctx2, linerange2, diffopts):
    """Return `(diffinrange, linerange1)` where `diffinrange` is True
    if diff from fctx2 to fctx1 has changes in linerange2 and
    `linerange1` is the new line range for fctx1.
    """
    blocks = mdiff.allblocks(fctx1.data(), fctx2.data(), diffopts)
    filteredblocks, linerange1 = mdiff.blocksinrange(blocks, linerange2)
    diffinrange = any(stype == '!' for _, stype in filteredblocks)
    return diffinrange, linerange1

def blockancestors(fctx, fromline, toline):
    """Yield ancestors of `fctx` with respect to the block of lines within
    `fromline`-`toline` range.
    """
    diffopts = patch.diffopts(fctx._repo.ui)
    visit = {(fctx.linkrev(), fctx.filenode()): (fctx, (fromline, toline))}
    while visit:
        c, linerange2 = visit.pop(max(visit))
        pl = c.parents()
        if not pl:
            # The block originates from the initial revision.
            yield c
            continue
        inrange = False
        for p in pl:
            inrangep, linerange1 = _changesrange(p, c, linerange2, diffopts)
            inrange = inrange or inrangep
            if linerange1[0] == linerange1[1]:
                # Parent's linerange is empty, meaning that the block got
                # introduced in this revision; no need to go futher in this
                # branch.