( )⚙ D12322 lfs: remove pycompat.iteritems()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12322

lfs: remove pycompat.iteritems()
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG1672c5af1271: lfs: remove pycompat.iteritems()

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

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: rHG1672c5af1271: lfs: remove pycompat.iteritems().Mar 8 2022, 5:57 AM
Closed by commit rHG1672c5af1271: lfs: remove pycompat.iteritems() (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/__init__.py (2 lines)
Mhgext/lfs/pointer.py (2 lines)

Diff 32533

hgext/lfs/__init__.py

ctx = context.resource(mapping, b'ctx') ctx = context.resource(mapping, b'ctx')
pointers = wrapper.pointersfromctx(ctx, removed=True) # {path: pointer} pointers = wrapper.pointersfromctx(ctx, removed=True) # {path: pointer}
files = sorted(pointers.keys()) files = sorted(pointers.keys())
def pointer(v): def pointer(v):
# In the file spec, version is first and the other keys are sorted. # In the file spec, version is first and the other keys are sorted.
sortkeyfunc = lambda x: (x[0] != b'version', x) sortkeyfunc = lambda x: (x[0] != b'version', x)
items = sorted(pycompat.iteritems(pointers[v]), key=sortkeyfunc) items = sorted(pointers[v].items(), key=sortkeyfunc)
return util.sortdict(items) return util.sortdict(items)
makemap = lambda v: { makemap = lambda v: {
b'file': v, b'file': v,
b'lfsoid': pointers[v].oid() if pointers[v] else None, b'lfsoid': pointers[v].oid() if pointers[v] else None,
b'lfspointer': templateutil.hybriddict(pointer(v)), b'lfspointer': templateutil.hybriddict(pointer(v)),
} }

hgext/lfs/pointer.py

return cls(l.split(b' ', 1) for l in text.splitlines()).validate() return cls(l.split(b' ', 1) for l in text.splitlines()).validate()
except ValueError: # l.split returns 1 item instead of 2 except ValueError: # l.split returns 1 item instead of 2
raise InvalidPointer( raise InvalidPointer(
_(b'cannot parse git-lfs text: %s') % stringutil.pprint(text) _(b'cannot parse git-lfs text: %s') % stringutil.pprint(text)
) )
def serialize(self): def serialize(self):
sortkeyfunc = lambda x: (x[0] != b'version', x) sortkeyfunc = lambda x: (x[0] != b'version', x)
items = sorted(pycompat.iteritems(self.validate()), key=sortkeyfunc) items = sorted(self.validate().items(), key=sortkeyfunc)
return b''.join(b'%s %s\n' % (k, v) for k, v in items) return b''.join(b'%s %s\n' % (k, v) for k, v in items)
def oid(self): def oid(self):
return self[b'oid'].split(b':')[-1] return self[b'oid'].split(b':')[-1]
def size(self): def size(self):
return int(self[b'size']) return int(self[b'size'])