This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10527

git: consistently use str for parents when rebuilding the index database
ClosedPublic

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

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGde26b9a7ec29: git: consistently use str for parents when rebuilding the index database
Summary

The tests show no changes, but when these values are overwritten shortly after
when a git commit object is available, that uses str. It seems better to use
that for consistency.

It does materially affect the database though, because the old value stored was
X'3030..3030' and is now '00..00' when the changelog table is dumped in
sqlite3. There is one query that specifies the parents, but it passes the non
null hashes as str, so it worked as expected. That likely explains the lack of
test changes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

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

Diff 27435

hgext/git/index.py

from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import os import os
import sqlite3 import sqlite3
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
nullhex,
nullid, nullid,
) )
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
pycompat, pycompat,
) )
if prog is not None: if prog is not None:
prog.complete() prog.complete()
prog = progress_factory(b'commits') prog = progress_factory(b'commits')
# This walker is sure to visit all the revisions in history, but # This walker is sure to visit all the revisions in history, but
# only once. # only once.
for pos, commit in enumerate(walker): for pos, commit in enumerate(walker):
if prog is not None: if prog is not None:
prog.update(pos) prog.update(pos)
p1 = p2 = nullhex p1 = p2 = gitutil.nullgit
if len(commit.parents) > 2: if len(commit.parents) > 2:
raise error.ProgrammingError( raise error.ProgrammingError(
( (
b"git support can't handle octopus merges, " b"git support can't handle octopus merges, "
b"found a commit with %d parents :(" b"found a commit with %d parents :("
) )
% len(commit.parents) % len(commit.parents)
) )