This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11937

rank: actually persist revision's rank in changelog-v2
ClosedPublic

Authored by marmoute on Dec 16 2021, 12:43 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc5d6c874766a: rank: actually persist revision's rank in changelog-v2
Summary

The changelog v2 format is now persisting whatever "rank" value is recorded.
However keep in mind that for we do not record any value.

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

marmoute created this revision.Dec 16 2021, 12:43 PM
Alphare accepted this revision.Dec 17 2021, 8:52 AM
This revision is now accepted and ready to land.Dec 17 2021, 8:52 AM
marmoute added a commit: rHGc5d6c874766a: rank: actually persist revision's rank in changelog-v2.Dec 17 2021, 9:00 AM
Closed by commit rHGc5d6c874766a: rank: actually persist revision's rank in changelog-v2 (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31534

mercurial/configitems.py

coreconfigitem( coreconfigitem(
b'format', b'format',
b'revlog-compression', b'revlog-compression',
default=lambda: [b'zstd', b'zlib'], default=lambda: [b'zstd', b'zlib'],
alias=[(b'experimental', b'format.compression')], alias=[(b'experimental', b'format.compression')],
) )
# Experimental TODOs: # Experimental TODOs:
# #
# * Same as for evlogv2 (but for the reduction of the number of files) # * Same as for revlogv2 (but for the reduction of the number of files)
# * Actually computing the rank of changesets
# * Improvement to investigate # * Improvement to investigate
# - storing .hgtags fnode # - storing .hgtags fnode
# - storing `rank` of changesets
# - storing branch related identifier # - storing branch related identifier
coreconfigitem( coreconfigitem(
b'format', b'format',
b'exp-use-changelog-v2', b'exp-use-changelog-v2',
default=None, default=None,
experimental=True, experimental=True,
) )

mercurial/pure/parsers.py

msg = 'version header should go in the docket, not the index: %d' msg = 'version header should go in the docket, not the index: %d'
msg %= header msg %= header
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
class IndexChangelogV2(IndexObject2): class IndexChangelogV2(IndexObject2):
index_format = revlog_constants.INDEX_ENTRY_CL_V2 index_format = revlog_constants.INDEX_ENTRY_CL_V2
null_item = (
IndexObject2.null_item[: revlog_constants.ENTRY_RANK]
+ (0,) # rank of null is 0
+ IndexObject2.null_item[revlog_constants.ENTRY_RANK :]
)
def _unpack_entry(self, rev, data, r=True): def _unpack_entry(self, rev, data, r=True):
items = self.index_format.unpack(data) items = self.index_format.unpack(data)
return ( return (
items[revlog_constants.INDEX_ENTRY_V2_IDX_OFFSET], items[revlog_constants.INDEX_ENTRY_V2_IDX_OFFSET],
items[revlog_constants.INDEX_ENTRY_V2_IDX_COMPRESSED_LENGTH], items[revlog_constants.INDEX_ENTRY_V2_IDX_COMPRESSED_LENGTH],
items[revlog_constants.INDEX_ENTRY_V2_IDX_UNCOMPRESSED_LENGTH], items[revlog_constants.INDEX_ENTRY_V2_IDX_UNCOMPRESSED_LENGTH],
rev, rev,
rev, rev,
items[revlog_constants.INDEX_ENTRY_V2_IDX_PARENT_1], items[revlog_constants.INDEX_ENTRY_V2_IDX_PARENT_1],
items[revlog_constants.INDEX_ENTRY_V2_IDX_PARENT_2], items[revlog_constants.INDEX_ENTRY_V2_IDX_PARENT_2],
items[revlog_constants.INDEX_ENTRY_V2_IDX_NODEID], items[revlog_constants.INDEX_ENTRY_V2_IDX_NODEID],
items[revlog_constants.INDEX_ENTRY_V2_IDX_SIDEDATA_OFFSET], items[revlog_constants.INDEX_ENTRY_V2_IDX_SIDEDATA_OFFSET],
items[ items[
revlog_constants.INDEX_ENTRY_V2_IDX_SIDEDATA_COMPRESSED_LENGTH revlog_constants.INDEX_ENTRY_V2_IDX_SIDEDATA_COMPRESSED_LENGTH
], ],
items[revlog_constants.INDEX_ENTRY_V2_IDX_COMPRESSION_MODE] & 3, items[revlog_constants.INDEX_ENTRY_V2_IDX_COMPRESSION_MODE] & 3,
(items[revlog_constants.INDEX_ENTRY_V2_IDX_COMPRESSION_MODE] >> 2) (items[revlog_constants.INDEX_ENTRY_V2_IDX_COMPRESSION_MODE] >> 2)
& 3, & 3,
revlog_constants.RANK_UNKNOWN, items[revlog_constants.INDEX_ENTRY_V2_IDX_RANK],
) )
def _pack_entry(self, rev, entry): def _pack_entry(self, rev, entry):
base = entry[revlog_constants.ENTRY_DELTA_BASE] base = entry[revlog_constants.ENTRY_DELTA_BASE]
link_rev = entry[revlog_constants.ENTRY_LINK_REV] link_rev = entry[revlog_constants.ENTRY_LINK_REV]
assert base == rev, (base, rev) assert base == rev, (base, rev)
assert link_rev == rev, (link_rev, rev) assert link_rev == rev, (link_rev, rev)
data = ( data = (
entry[revlog_constants.ENTRY_DATA_OFFSET], entry[revlog_constants.ENTRY_DATA_OFFSET],
entry[revlog_constants.ENTRY_DATA_COMPRESSED_LENGTH], entry[revlog_constants.ENTRY_DATA_COMPRESSED_LENGTH],
entry[revlog_constants.ENTRY_DATA_UNCOMPRESSED_LENGTH], entry[revlog_constants.ENTRY_DATA_UNCOMPRESSED_LENGTH],
entry[revlog_constants.ENTRY_PARENT_1], entry[revlog_constants.ENTRY_PARENT_1],
entry[revlog_constants.ENTRY_PARENT_2], entry[revlog_constants.ENTRY_PARENT_2],
entry[revlog_constants.ENTRY_NODE_ID], entry[revlog_constants.ENTRY_NODE_ID],
entry[revlog_constants.ENTRY_SIDEDATA_OFFSET], entry[revlog_constants.ENTRY_SIDEDATA_OFFSET],
entry[revlog_constants.ENTRY_SIDEDATA_COMPRESSED_LENGTH], entry[revlog_constants.ENTRY_SIDEDATA_COMPRESSED_LENGTH],
entry[revlog_constants.ENTRY_DATA_COMPRESSION_MODE] & 3 entry[revlog_constants.ENTRY_DATA_COMPRESSION_MODE] & 3
| (entry[revlog_constants.ENTRY_SIDEDATA_COMPRESSION_MODE] & 3) | (entry[revlog_constants.ENTRY_SIDEDATA_COMPRESSION_MODE] & 3)
<< 2, << 2,
entry[revlog_constants.ENTRY_RANK],
) )
return self.index_format.pack(*data) return self.index_format.pack(*data)
def parse_index_devel_nodemap(data, inline): def parse_index_devel_nodemap(data, inline):
"""like parse_index2, but alway return a PersistentNodeMapIndexObject""" """like parse_index2, but alway return a PersistentNodeMapIndexObject"""
return PersistentNodeMapIndexObject(data), None return PersistentNodeMapIndexObject(data), None

mercurial/revlogutils/constants.py

# 4 bytes: compressed length # 4 bytes: compressed length
# 4 bytes: uncompressed length # 4 bytes: uncompressed length
# 4 bytes: parent 1 rev # 4 bytes: parent 1 rev
# 4 bytes: parent 2 rev # 4 bytes: parent 2 rev
# 32 bytes: nodeid # 32 bytes: nodeid
# 8 bytes: sidedata offset # 8 bytes: sidedata offset
# 4 bytes: sidedata compressed length # 4 bytes: sidedata compressed length
# 1 bytes: compression mode (2 lower bit are data_compression_mode) # 1 bytes: compression mode (2 lower bit are data_compression_mode)
# 27 bytes: Padding to align to 96 bytes (see RevlogV2Plan wiki page) # 4 bytes: changeset rank (i.e. `len(::REV)`)
INDEX_ENTRY_CL_V2 = struct.Struct(b">Qiiii20s12xQiB27x") # 23 bytes: Padding to align to 96 bytes (see RevlogV2Plan wiki page)
INDEX_ENTRY_CL_V2 = struct.Struct(b">Qiiii20s12xQiBi23x")
assert INDEX_ENTRY_CL_V2.size == 32 * 3, INDEX_ENTRY_CL_V2.size assert INDEX_ENTRY_CL_V2.size == 32 * 3, INDEX_ENTRY_CL_V2.size
INDEX_ENTRY_V2_IDX_OFFSET = 0 INDEX_ENTRY_V2_IDX_OFFSET = 0
INDEX_ENTRY_V2_IDX_COMPRESSED_LENGTH = 1 INDEX_ENTRY_V2_IDX_COMPRESSED_LENGTH = 1
INDEX_ENTRY_V2_IDX_UNCOMPRESSED_LENGTH = 2 INDEX_ENTRY_V2_IDX_UNCOMPRESSED_LENGTH = 2
INDEX_ENTRY_V2_IDX_PARENT_1 = 3 INDEX_ENTRY_V2_IDX_PARENT_1 = 3
INDEX_ENTRY_V2_IDX_PARENT_2 = 4 INDEX_ENTRY_V2_IDX_PARENT_2 = 4
INDEX_ENTRY_V2_IDX_NODEID = 5 INDEX_ENTRY_V2_IDX_NODEID = 5
INDEX_ENTRY_V2_IDX_SIDEDATA_OFFSET = 6 INDEX_ENTRY_V2_IDX_SIDEDATA_OFFSET = 6
INDEX_ENTRY_V2_IDX_SIDEDATA_COMPRESSED_LENGTH = 7 INDEX_ENTRY_V2_IDX_SIDEDATA_COMPRESSED_LENGTH = 7
INDEX_ENTRY_V2_IDX_COMPRESSION_MODE = 8 INDEX_ENTRY_V2_IDX_COMPRESSION_MODE = 8
INDEX_ENTRY_V2_IDX_RANK = 9
# revlog index flags # revlog index flags
# For historical reasons, revlog's internal flags were exposed via the # For historical reasons, revlog's internal flags were exposed via the
# wire protocol and are even exposed in parts of the storage APIs. # wire protocol and are even exposed in parts of the storage APIs.
# revision has censor metadata, must be verified # revision has censor metadata, must be verified
REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED