From patchwork Tue May 25 23:55:57 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D10770: docket: make compatible with py3.6,
 where Struct.format is bytes
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 49090
Message-Id: <differential-rev-PHID-DREV-yjfq2pisc7p52ukvehwk-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Tue, 25 May 2021 23:55:57 +0000

martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10770

AFFECTED FILES
  mercurial/revlogutils/docket.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

diff --git a/mercurial/revlogutils/docket.py b/mercurial/revlogutils/docket.py
--- a/mercurial/revlogutils/docket.py
+++ b/mercurial/revlogutils/docket.py
@@ -93,7 +93,9 @@
 # * 8 bytes: size of data
 # * 8 bytes: pending size of data
 # * 1 bytes: default compression header
-S_HEADER = struct.Struct(constants.INDEX_HEADER.format + 'LLLLc')
+S_HEADER = struct.Struct(
+    pycompat.sysstr(constants.INDEX_HEADER.format) + 'LLLLc'
+)
 
 
 class RevlogDocket(object):