comparison mercurial/context.py @ 36918:5d3abd6a5b25

dagop: extract core algorithm of annotate() from context.py

See the previous patch for why.

36917:7affcabf561e

    dagop,
    encoding,
    error,
    fileset,
    match as matchmod,
    mdiff,
    obsolete as obsmod,
    obsutil,
    patch,
    pathutil,
    phases,

        in the file, where ctx is the filectx of the node where
        that line was last changed; if linenumber parameter is true, number is
        the line number at the first appearance in the managed file, otherwise,
        number has a fixed value of False.
        '''
        annotateline = dagop.annotateline
        _annotatepair = dagop._annotatepair

        def lines(text):
            if text.endswith("\n"):
                return text.count("\n")
            return text.count("\n") + int(bool(text))

        if linenumber:
            def decorate(text, rev):
                return ([annotateline(fctx=rev, lineno=i)
                         for i in xrange(1, lines(text) + 1)], text)
        else:
            def decorate(text, rev):
                return ([annotateline(fctx=rev)] * 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

                                  inclusive=True)
            else:
                ac = cl.ancestors([base.rev()], inclusive=True)
            base._ancestrycontext = ac

        # This algorithm would prefer to be recursive, but Python is a
        # bit recursion-hostile. Instead we do an iterative
        # depth-first search.

        # 1st DFS pre-calculates pcache and needed
        visit = [base]
        pcache = {}
        needed = {base: 1}
        while visit:
            f = visit.pop()
            if f in pcache:
                continue
            pl = parents(f)
            pcache[f] = pl
            for p in pl:
                needed[p] = needed.get(p, 0) + 1
                if p not in pcache:
                    visit.append(p)

        # 2nd DFS does the actual annotate
        visit[:] = [base]
        hist = {}
        while visit:
            f = visit[-1]
            if f in hist:
                visit.pop()
                continue

            ready = True
            pl = pcache[f]
            for p in pl:
                if p not in hist:
                    ready = False
                    visit.append(p)
            if ready:
                visit.pop()
                curr = decorate(f.data(), f)
                skipchild = False
                if skiprevs is not None:
                    skipchild = f._changeid in skiprevs
                curr = _annotatepair([hist[p] for p in pl], f, curr, skipchild,
                                     diffopts)
                for p in pl:
                    if needed[p] == 1:
                        del hist[p]
                        del needed[p]
                    else:
                        needed[p] -= 1

                hist[f] = curr
                del pcache[f]

        lineattrs, text = hist[base]
        return pycompat.ziplist(lineattrs, mdiff.splitnewlines(text))

    def ancestors(self, followfirst=False):
        visit = {}
        c = self
        if followfirst:

36918:5d3abd6a5b25

    dagop,
    encoding,
    error,
    fileset,
    match as matchmod,
    obsolete as obsmod,
    obsutil,
    patch,
    pathutil,
    phases,

        in the file, where ctx is the filectx of the node where
        that line was last changed; if linenumber parameter is true, number is
        the line number at the first appearance in the managed file, otherwise,
        number has a fixed value of False.
        '''
        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

                                  inclusive=True)
            else:
                ac = cl.ancestors([base.rev()], inclusive=True)
            base._ancestrycontext = ac

        return dagop.annotate(base, parents, linenumber=linenumber,
                              skiprevs=skiprevs, diffopts=diffopts)

    def ancestors(self, followfirst=False):
        visit = {}
        c = self
        if followfirst: