comparison hgext/remotefilelog/remotefilectx.py @ 40610:13d4ad8d7801

py3: fix keyword arguments handling in hgext/remotefilelog/

Keys of kwargs on Python 3 should be strings. This patch fixes them by appending
r'' prefixes, and using pycompat.byteskwargs() and pycompat.strkwargs().

Differential Revision: https://phab.mercurial-scm.org/D5259

40609:ee9981bc8b44

from mercurial import (
    ancestor,
    context,
    error,
    phases,
    util,
)
from . import shallowutil

propertycache = util.propertycache

        if self._verifylinknode(revs, linknode):
            return linknode

        commonlogkwargs = {
            'revs': ' '.join([hex(cl.node(rev)) for rev in revs]),
            'fnode': hex(fnode),
            'filepath': path,
            'user': shallowutil.getusername(repo.ui),
            'reponame': shallowutil.getreponame(repo.ui),
        }

        repo.ui.log('linkrevfixup', 'adjusting linknode', **commonlogkwargs)

        pc = repo._phasecache

            logmsg = 'remotefilelog prefetching failed (%s)' % e
            return None
        finally:
            elapsed = time.time() - start
            repo.ui.log('linkrevfixup', logmsg, elapsed=elapsed * 1000,
                        **commonlogkwargs)

    def _verifylinknode(self, revs, linknode):
        """
        Check if a linknode is correct one for the current history.

        return None

    def annotate(self, *args, **kwargs):
        introctx = self
        prefetchskip = kwargs.pop('prefetchskip', None)
        if prefetchskip:
            # use introrev so prefetchskip can be accurately tested
            introrev = self.introrev()
            if self.rev() != introrev:
                introctx = remotefilectx(self._repo, self._path,

40610:13d4ad8d7801

from mercurial import (
    ancestor,
    context,
    error,
    phases,
    pycompat,
    util,
)
from . import shallowutil

propertycache = util.propertycache

        if self._verifylinknode(revs, linknode):
            return linknode

        commonlogkwargs = {
            r'revs': ' '.join([hex(cl.node(rev)) for rev in revs]),
            r'fnode': hex(fnode),
            r'filepath': path,
            r'user': shallowutil.getusername(repo.ui),
            r'reponame': shallowutil.getreponame(repo.ui),
        }

        repo.ui.log('linkrevfixup', 'adjusting linknode', **commonlogkwargs)

        pc = repo._phasecache

            logmsg = 'remotefilelog prefetching failed (%s)' % e
            return None
        finally:
            elapsed = time.time() - start
            repo.ui.log('linkrevfixup', logmsg, elapsed=elapsed * 1000,
                        **pycompat.strkwargs(commonlogkwargs))

    def _verifylinknode(self, revs, linknode):
        """
        Check if a linknode is correct one for the current history.

        return None

    def annotate(self, *args, **kwargs):
        introctx = self
        prefetchskip = kwargs.pop(r'prefetchskip', None)
        if prefetchskip:
            # use introrev so prefetchskip can be accurately tested
            introrev = self.introrev()
            if self.rev() != introrev:
                introctx = remotefilectx(self._repo, self._path,