hgext/fastannotate/context.py

46112:d6afa9c149c3

from mercurial.pycompat import (
    getattr,
    open,
    setattr,
)
from mercurial import (
    error,
    linelog as linelogmod,
    lock as lockmod,
    mdiff,
    node,
    pycompat,
    scmutil,
    util,
)
from mercurial.utils import (

def hashdiffopts(diffopts):
    diffoptstr = stringutil.pprint(
        sorted((k, getattr(diffopts, k)) for k in mdiff.diffopts.defaults)
    )
    return node.hex(hashutil.sha1(diffoptstr).digest())[:6]


_defaultdiffopthash = hashdiffopts(mdiff.defaultopts)

        # the fast path test requires commit hash, convert rev number to hash,
        # so it may hit the fast path. note: in the "fctx" mode, the "annotate"
        # command could give us a revision number even if the user passes a
        # commit hash.
        if isinstance(rev, int):
            rev = node.hex(self.repo.changelog.node(rev))

        # fast path: if rev is in the main branch already
        directly, revfctx = self.canannotatedirectly(rev)
        if directly:
            if self.ui.debugflag:

        from rev.
        """
        result = True
        f = None
        if not isinstance(rev, int) and rev is not None:
            hsh = {20: bytes, 40: node.bin}.get(len(rev), lambda x: None)(rev)
            if hsh is not None and (hsh, self.path) in self.revmap:
                f = hsh
        if f is None:
            adjustctx = b'linkrev' if self._perfhack else True
            f = self._resolvefctx(rev, adjustctx=adjustctx, resolverev=True)

                        hsh = annotateresult[idxs[0]][0]
                        if self.ui.debugflag:
                            self.ui.debug(
                                b'fastannotate: reading %s line #%d '
                                b'to resolve lines %r\n'
                                % (node.short(hsh), linenum, idxs)
                            )
                        fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
                        lines = mdiff.splitnewlines(fctx.data())
                        revlines[rev] = lines
                    for idx in idxs:

                assert all(x is not None for x in result)
                return result

            # run the annotate and the lines should match to the file content
            self.ui.debug(
                b'fastannotate: annotate %s to resolve lines\n'
                % node.short(hsh)
            )
            linelog.annotate(rev)
            fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
            annotated = linelog.annotateresult
            lines = mdiff.splitnewlines(fctx.data())

            hsh = f
        else:
            hsh = f.node()
        llrev = self.revmap.hsh2rev(hsh)
        if not llrev:
            raise faerror.CorruptedFileError(
                b'%s is not in revmap' % node.hex(hsh)
            )
        if (self.revmap.rev2flag(llrev) & revmapmod.sidebranchflag) != 0:
            raise faerror.CorruptedFileError(
                b'%s is not in revmap mainbranch' % node.hex(hsh)
            )
        self.linelog.annotate(llrev)
        result = [
            (self.revmap.rev2hsh(r), l) for r, l in self.linelog.annotateresult
        ]

46113:59fa3890d40a

from mercurial.pycompat import (
    getattr,
    open,
    setattr,
)
from mercurial.node import (
    bin,
    hex,
    short,
)
from mercurial import (
    error,
    linelog as linelogmod,
    lock as lockmod,
    mdiff,
    pycompat,
    scmutil,
    util,
)
from mercurial.utils import (

def hashdiffopts(diffopts):
    diffoptstr = stringutil.pprint(
        sorted((k, getattr(diffopts, k)) for k in mdiff.diffopts.defaults)
    )
    return hex(hashutil.sha1(diffoptstr).digest())[:6]


_defaultdiffopthash = hashdiffopts(mdiff.defaultopts)

        # the fast path test requires commit hash, convert rev number to hash,
        # so it may hit the fast path. note: in the "fctx" mode, the "annotate"
        # command could give us a revision number even if the user passes a
        # commit hash.
        if isinstance(rev, int):
            rev = hex(self.repo.changelog.node(rev))

        # fast path: if rev is in the main branch already
        directly, revfctx = self.canannotatedirectly(rev)
        if directly:
            if self.ui.debugflag:

        from rev.
        """
        result = True
        f = None
        if not isinstance(rev, int) and rev is not None:
            hsh = {20: bytes, 40: bin}.get(len(rev), lambda x: None)(rev)
            if hsh is not None and (hsh, self.path) in self.revmap:
                f = hsh
        if f is None:
            adjustctx = b'linkrev' if self._perfhack else True
            f = self._resolvefctx(rev, adjustctx=adjustctx, resolverev=True)

                        hsh = annotateresult[idxs[0]][0]
                        if self.ui.debugflag:
                            self.ui.debug(
                                b'fastannotate: reading %s line #%d '
                                b'to resolve lines %r\n'
                                % (short(hsh), linenum, idxs)
                            )
                        fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
                        lines = mdiff.splitnewlines(fctx.data())
                        revlines[rev] = lines
                    for idx in idxs:

                assert all(x is not None for x in result)
                return result

            # run the annotate and the lines should match to the file content
            self.ui.debug(
                b'fastannotate: annotate %s to resolve lines\n' % short(hsh)
            )
            linelog.annotate(rev)
            fctx = self._resolvefctx(hsh, revmap.rev2path(rev))
            annotated = linelog.annotateresult
            lines = mdiff.splitnewlines(fctx.data())

            hsh = f
        else:
            hsh = f.node()
        llrev = self.revmap.hsh2rev(hsh)
        if not llrev:
            raise faerror.CorruptedFileError(b'%s is not in revmap' % hex(hsh))
        if (self.revmap.rev2flag(llrev) & revmapmod.sidebranchflag) != 0:
            raise faerror.CorruptedFileError(
                b'%s is not in revmap mainbranch' % hex(hsh)
            )
        self.linelog.annotate(llrev)
        result = [
            (self.revmap.rev2hsh(r), l) for r, l in self.linelog.annotateresult
        ]