This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6968

sidedata: adjust string for python3
ClosedPublic

Authored by marmoute on Oct 4 2019, 5:07 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc348d829d23a: sidedata: adjust string for python3
Summary

This was pointed out by Gregory Szorc: Python 3 will require a r'' because of
source transformation.

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.Oct 4 2019, 5:07 PM
marmoute retitled this revision from sidedata: adjust string for python to sidedata: adjust string for python3.Oct 4 2019, 5:11 PM
indygreg accepted this revision.Oct 4 2019, 5:41 PM
This revision is now accepted and ready to land.Oct 4 2019, 5:41 PM
marmoute added a commit: rHGc348d829d23a: sidedata: adjust string for python3.Oct 4 2019, 5:42 PM
Closed by commit rHGc348d829d23a: sidedata: adjust string for python3 (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/sidedata.py (4 lines)

Diff 16811

mercurial/revlogutils/sidedata.py

SD_TEST2 = 2 SD_TEST2 = 2
SD_TEST3 = 3 SD_TEST3 = 3
SD_TEST4 = 4 SD_TEST4 = 4
SD_TEST5 = 5 SD_TEST5 = 5
SD_TEST6 = 6 SD_TEST6 = 6
SD_TEST7 = 7 SD_TEST7 = 7
# internal format constant # internal format constant
SIDEDATA_HEADER = struct.Struct('>H') SIDEDATA_HEADER = struct.Struct(r'>H')
SIDEDATA_ENTRY = struct.Struct('>HL20s') SIDEDATA_ENTRY = struct.Struct(r'>HL20s')
def sidedatawriteprocessor(rl, text, sidedata): def sidedatawriteprocessor(rl, text, sidedata):
sidedata = list(sidedata.items()) sidedata = list(sidedata.items())
sidedata.sort() sidedata.sort()
rawtext = [SIDEDATA_HEADER.pack(len(sidedata))] rawtext = [SIDEDATA_HEADER.pack(len(sidedata))]
for key, value in sidedata: for key, value in sidedata:
digest = hashlib.sha1(value).digest() digest = hashlib.sha1(value).digest()
rawtext.append(SIDEDATA_ENTRY.pack(key, len(value), digest)) rawtext.append(SIDEDATA_ENTRY.pack(key, len(value), digest))