This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12323

remotefilelog: remove pycompat.iteritems()
ClosedPublic

Authored by indygreg on Mar 3 2022, 4:21 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG0fe003495f72: remotefilelog: remove pycompat.iteritems()

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

indygreg created this revision.Mar 3 2022, 4:21 PM
Alphare accepted this revision.Mar 8 2022, 4:26 AM
This revision is now accepted and ready to land.Mar 8 2022, 4:26 AM
indygreg added a commit: rHG0fe003495f72: remotefilelog: remove pycompat.iteritems().Mar 8 2022, 5:57 AM
Closed by commit rHG0fe003495f72: remotefilelog: remove pycompat.iteritems() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/shallowutil.py (4 lines)

Diff 32575

hgext/remotefilelog/shallowutil.py

The dict contains raw content - both keys and values are strings. The dict contains raw content - both keys and values are strings.
Upper-level business may want to serialize some of other types (like Upper-level business may want to serialize some of other types (like
integers) to strings before calling this function. integers) to strings before calling this function.
raise ProgrammingError when metadata key is illegal, or ValueError if raise ProgrammingError when metadata key is illegal, or ValueError if
length limit is exceeded length limit is exceeded
""" """
metabuf = b'' metabuf = b''
for k, v in sorted(pycompat.iteritems((metadict or {}))): for k, v in sorted((metadict or {}).items()):
if len(k) != 1: if len(k) != 1:
raise error.ProgrammingError(b'packmeta: illegal key: %s' % k) raise error.ProgrammingError(b'packmeta: illegal key: %s' % k)
if len(v) > 0xFFFE: if len(v) > 0xFFFE:
raise ValueError( raise ValueError(
b'metadata value is too long: 0x%x > 0xfffe' % len(v) b'metadata value is too long: 0x%x > 0xfffe' % len(v)
) )
metabuf += k metabuf += k
metabuf += struct.pack(b'!H', len(v)) metabuf += struct.pack(b'!H', len(v))
def buildpackmeta(metadict): def buildpackmeta(metadict):
"""like _buildpackmeta, but typechecks metadict and normalize it. """like _buildpackmeta, but typechecks metadict and normalize it.
This means, METAKEYSIZE and METAKEYSIZE should have integers as values, This means, METAKEYSIZE and METAKEYSIZE should have integers as values,
and METAKEYFLAG will be dropped if its value is 0. and METAKEYFLAG will be dropped if its value is 0.
""" """
newmeta = {} newmeta = {}
for k, v in pycompat.iteritems(metadict or {}): for k, v in (metadict or {}).items():
expectedtype = _metaitemtypes.get(k, (bytes,)) expectedtype = _metaitemtypes.get(k, (bytes,))
if not isinstance(v, expectedtype): if not isinstance(v, expectedtype):
raise error.ProgrammingError(b'packmeta: wrong type of key %s' % k) raise error.ProgrammingError(b'packmeta: wrong type of key %s' % k)
# normalize int to binary buffer # normalize int to binary buffer
if int in expectedtype: if int in expectedtype:
# optimization: remove flag if it's 0 to save space # optimization: remove flag if it's 0 to save space
if k == constants.METAKEYFLAG and v == 0: if k == constants.METAKEYFLAG and v == 0:
continue continue