( )⚙ D10528 git: initialize `extra` to have at least the branch name for nullid

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10528

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

Authored by mharbison72 on Apr 27 2021, 7:53 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf8fa7ec53517: git: initialize `extra` to have at least the branch name for nullid
Summary

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

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Apr 27 2021, 7:53 PM
pulkit accepted this revision.Apr 28 2021, 6:29 AM
This revision is now accepted and ready to land.Apr 28 2021, 6:29 AM

Revision Contents
Changeset List

PathPackages
Mhgext/git/gitlog.py (5 lines)
Mtests/test-git-interop.t (6 lines)

Diff 27180

hgext/git/gitlog.py

return sorted(realheads) return sorted(realheads)
def changelogrevision(self, nodeorrev): def changelogrevision(self, nodeorrev):
# Ensure we have a node id # Ensure we have a node id
if isinstance(nodeorrev, int): if isinstance(nodeorrev, int):
n = self.node(nodeorrev) n = self.node(nodeorrev)
else: else:
n = nodeorrev n = nodeorrev
extra = {b'branch': b'default'}
# handle looking up nullid # handle looking up nullid
if n == nullid: if n == nullid:
return hgchangelog._changelogrevision(extra={}, manifest=nullid) return hgchangelog._changelogrevision(extra=extra, manifest=nullid)
hn = gitutil.togitnode(n) hn = gitutil.togitnode(n)
# We've got a real commit! # We've got a real commit!
files = [ files = [
r[0] r[0]
for r in self._db.execute( for r in self._db.execute(
'SELECT filename FROM changedfiles ' 'SELECT filename FROM changedfiles '
'WHERE node = ? and filenode != ?', 'WHERE node = ? and filenode != ?',
(hn, gitutil.nullgit), (hn, gitutil.nullgit),
user=b'%s <%s>' user=b'%s <%s>'
% (c.author.name.encode('utf8'), c.author.email.encode('utf8')), % (c.author.name.encode('utf8'), c.author.email.encode('utf8')),
date=(c.author.time, -c.author.offset * 60), date=(c.author.time, -c.author.offset * 60),
files=files, files=files,
# TODO filesadded in the index # TODO filesadded in the index
filesremoved=filesremoved, filesremoved=filesremoved,
description=c.message.encode('utf8'), description=c.message.encode('utf8'),
# TODO do we want to handle extra? how? # TODO do we want to handle extra? how?
extra={b'branch': b'default'}, extra=extra,
) )
def ancestors(self, revs, stoprev=0, inclusive=False): def ancestors(self, revs, stoprev=0, inclusive=False):
revs = list(revs) revs = list(revs)
tip = self.rev(self.tip()) tip = self.rev(self.tip())
for r in revs: for r in revs:
if r > tip: if r > tip:
raise IndexError(b'Invalid rev %r' % r) raise IndexError(b'Invalid rev %r' % r)

tests/test-git-interop.t

Test some edge cases around a commitless repo first Test some edge cases around a commitless repo first
$ mkdir empty $ mkdir empty
$ cd empty $ cd empty
$ git init $ git init
Initialized empty Git repository in $TESTTMP/empty/.git/ Initialized empty Git repository in $TESTTMP/empty/.git/
$ hg init --git $ hg init --git
$ hg heads $ hg heads
[1] [1]
$ hg tip
changeset: -1:000000000000
tag: tip
user:
date: Thu Jan 01 00:00:00 1970 +0000
$ cd .. $ cd ..
Make a new repo with git: Make a new repo with git:
$ mkdir foo $ mkdir foo
$ cd foo $ cd foo
$ git init $ git init
Initialized empty Git repository in $TESTTMP/foo/.git/ Initialized empty Git repository in $TESTTMP/foo/.git/
Ignore the .hg directory within git: Ignore the .hg directory within git: