comparison hgext/git/gitlog.py @ 47052:f8fa7ec53517 stable

git: initialize `extra` to have at least the branch name for nullid

Otherwise, this crashes trying to convert to local encoding:

    ...
      File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 333, in _show
        branch = ctx.branch()
      File "/mnt/c/Users/Matt/hg/mercurial/context.py", line 675, in branch
        return encoding.tolocal(self._changeset.extra.get(b"branch"))
      File "/mnt/c/Users/Matt/hg/mercurial/encoding.py", line 181, in tolocal
        if isasciistr(s):
    TypeError: a bytes-like object is required, not 'NoneType'

This was originally reported to the thg bug tracker.

https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5629

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

47051:de26b9a7ec29

        # Ensure we have a node id
        if isinstance(nodeorrev, int):
            n = self.node(nodeorrev)
        else:
            n = nodeorrev
        # handle looking up nullid
        if n == nullid:
            return hgchangelog._changelogrevision(extra={}, manifest=nullid)
        hn = gitutil.togitnode(n)
        # We've got a real commit!
        files = [
            r[0]
            for r in self._db.execute(

            files=files,
            # TODO filesadded in the index
            filesremoved=filesremoved,
            description=c.message.encode('utf8'),
            # TODO do we want to handle extra? how?
            extra={b'branch': b'default'},
        )

    def ancestors(self, revs, stoprev=0, inclusive=False):
        revs = list(revs)
        tip = self.rev(self.tip())

47052:f8fa7ec53517

        # Ensure we have a node id
        if isinstance(nodeorrev, int):
            n = self.node(nodeorrev)
        else:
            n = nodeorrev
        extra = {b'branch': b'default'}
        # handle looking up nullid
        if n == nullid:
            return hgchangelog._changelogrevision(extra=extra, manifest=nullid)
        hn = gitutil.togitnode(n)
        # We've got a real commit!
        files = [
            r[0]
            for r in self._db.execute(

            files=files,
            # TODO filesadded in the index
            filesremoved=filesremoved,
            description=c.message.encode('utf8'),
            # TODO do we want to handle extra? how?
            extra=extra,
        )

    def ancestors(self, revs, stoprev=0, inclusive=False):
        revs = list(revs)
        tip = self.rev(self.tip())