This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8622

hgext.git: decode node IDs back into Python strings (issue6349)
ClosedPublic

Authored by hollisb on Jun 9 2020, 4:49 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGfb2936c5f6dc: git: decode node IDs back into Python strings (issue6349)
Summary

db.text_factory = bytes, so the database contains only strings. The object IDs
we get from pygit2 are Python strings. b'foo' != 'foo'

This change allows the "don't reindex" optimization to work by allowing the
"cur_cache_heads == cache_heads" comparison a few lines down to succeed.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mhgext/git/index.py (5 lines)

Diff 21592

hgext/git/index.py

# Optimization: if the list of heads hasn't changed, don't # Optimization: if the list of heads hasn't changed, don't
# reindex, the changelog. This doesn't matter on small # reindex, the changelog. This doesn't matter on small
# repositories, but on even moderately deep histories (eg cpython) # repositories, but on even moderately deep histories (eg cpython)
# this is a very important performance win. # this is a very important performance win.
# #
# TODO: we should figure out how to incrementally index history # TODO: we should figure out how to incrementally index history
# (preferably by detecting rewinds!) so that we don't have to do a # (preferably by detecting rewinds!) so that we don't have to do a
# full changelog walk every time a new commit is created. # full changelog walk every time a new commit is created.
cache_heads = {x[0] for x in db.execute('SELECT node FROM possible_heads')} cache_heads = {
x[0].decode("utf-8")
for x in db.execute('SELECT node FROM possible_heads')
}
walker = None walker = None
cur_cache_heads = {h.hex for h in possible_heads} cur_cache_heads = {h.hex for h in possible_heads}
if cur_cache_heads == cache_heads: if cur_cache_heads == cache_heads:
return return
for start in possible_heads: for start in possible_heads:
if walker is None: if walker is None:
walker = gitrepo.walk(start, _OUR_ORDER) walker = gitrepo.walk(start, _OUR_ORDER)
else: else: