Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
index: use an explicit constant for INDEX_HEADER format and use it for docket
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 03 Jun 2021 16:12:03 +0200
changeset 47371 298d4400ea68
parent 47370 ab5fd39cb402
child 47372 9e6e12e1a87e
index: use an explicit constant for INDEX_HEADER format and use it for docket This avoid leaking python-3.6 compatibility details too much. Differential Revision: https://phab.mercurial-scm.org/D10831
mercurial/revlogutils/constants.py file | annotate | diff | comparison | revisions
mercurial/revlogutils/docket.py file | annotate | diff | comparison | revisions 
--- a/mercurial/revlogutils/constants.py	Tue Jun 01 09:18:27 2021 +0200
+++ b/mercurial/revlogutils/constants.py	Thu Jun 03 16:12:03 2021 +0200
@@ -29,7 +29,9 @@
 
 ### main revlog header
 
-INDEX_HEADER = struct.Struct(b">I")
+# We cannot rely on  Struct.format is inconsistent for python <=3.6 versus above
+INDEX_HEADER_FMT = b">I"
+INDEX_HEADER = struct.Struct(INDEX_HEADER_FMT)
 
 ## revlog version
 REVLOGV0 = 0
--- a/mercurial/revlogutils/docket.py	Tue Jun 01 09:18:27 2021 +0200
+++ b/mercurial/revlogutils/docket.py	Thu Jun 03 16:12:03 2021 +0200
@@ -95,9 +95,7 @@
 # * 8 bytes: size of data
 # * 8 bytes: pending size of data
 # * 1 bytes: default compression header
-S_HEADER = struct.Struct(
-    pycompat.sysstr(constants.INDEX_HEADER.format) + 'BBLLLLc'
-)
+S_HEADER = struct.Struct(constants.INDEX_HEADER_FMT + b'BBLLLLc')
 
 
 class RevlogDocket(object):
mercurial