This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12374

revlog: fix wrong type of rank_unknown variable
ClosedPublic

Authored by jcristau on Mar 14 2022, 1:00 PM.

Details

Reviewers
pacien
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9ce563fb2989: revlog: fix wrong type of rank_unknown variable
Summary

We treat "rank" as an int everywhere, but declare rank_unknown as a
char. On architectures where char is signed, that works out ok, but
when char is unsigned, rank_unknown is 255 instead of -1.

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.

Event Timeline

jcristau created this revision.Mar 14 2022, 1:00 PM
pacien accepted this revision.Mar 14 2022, 1:15 PM
pacien added a subscriber: pacien.

Resolves failure of test-parseindex2 on aarch64-linux for me on NixOS.
Thanks!

Alphare accepted this revision.Mar 15 2022, 4:25 AM
Alphare added a subscriber: Alphare.

Thanks!

This revision is now accepted and ready to land.Mar 15 2022, 4:25 AM
jcristau added a commit: rHG9ce563fb2989: revlog: fix wrong type of rank_unknown variable.Mar 15 2022, 4:33 AM
Closed by commit rHG9ce563fb2989: revlog: fix wrong type of rank_unknown variable (authored by jcristau). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/revlog.c (2 lines)

Diff 32642

mercurial/cext/revlog.c

static const long entry_cl2_offset_node_id = 24; static const long entry_cl2_offset_node_id = 24;
static const long entry_cl2_offset_sidedata_offset = 56; static const long entry_cl2_offset_sidedata_offset = 56;
static const long entry_cl2_offset_sidedata_comp_len = 64; static const long entry_cl2_offset_sidedata_comp_len = 64;
static const long entry_cl2_offset_all_comp_mode = 68; static const long entry_cl2_offset_all_comp_mode = 68;
static const long entry_cl2_offset_rank = 69; static const long entry_cl2_offset_rank = 69;
/* next free offset: 73 */ /* next free offset: 73 */
static const char comp_mode_inline = 2; static const char comp_mode_inline = 2;
static const char rank_unknown = -1; static const int rank_unknown = -1;
static void raise_revlog_error(void) static void raise_revlog_error(void)
{ {
PyObject *mod = NULL, *dict = NULL, *errclass = NULL; PyObject *mod = NULL, *dict = NULL, *errclass = NULL;
mod = PyImport_ImportModule("mercurial.error"); mod = PyImport_ImportModule("mercurial.error");
if (mod == NULL) { if (mod == NULL) {
goto cleanup; goto cleanup;