equal
deleted
inserted
replaced
39 _(b'cannot parse git-lfs text: %s') % stringutil.pprint(text) |
39 _(b'cannot parse git-lfs text: %s') % stringutil.pprint(text) |
40 ) |
40 ) |
41 |
41 |
42 def serialize(self): |
42 def serialize(self): |
43 sortkeyfunc = lambda x: (x[0] != b'version', x) |
43 sortkeyfunc = lambda x: (x[0] != b'version', x) |
44 items = sorted(self.validate().iteritems(), key=sortkeyfunc) |
44 items = sorted(pycompat.iteritems(self.validate()), key=sortkeyfunc) |
45 return b''.join(b'%s %s\n' % (k, v) for k, v in items) |
45 return b''.join(b'%s %s\n' % (k, v) for k, v in items) |
46 |
46 |
47 def oid(self): |
47 def oid(self): |
48 return self[b'oid'].split(b':')[-1] |
48 return self[b'oid'].split(b':')[-1] |
49 |
49 |
61 } |
61 } |
62 |
62 |
63 def validate(self): |
63 def validate(self): |
64 """raise InvalidPointer on error. return self if there is no error""" |
64 """raise InvalidPointer on error. return self if there is no error""" |
65 requiredcount = 0 |
65 requiredcount = 0 |
66 for k, v in self.iteritems(): |
66 for k, v in pycompat.iteritems(self): |
67 if k in self._requiredre: |
67 if k in self._requiredre: |
68 if not self._requiredre[k].match(v): |
68 if not self._requiredre[k].match(v): |
69 raise InvalidPointer( |
69 raise InvalidPointer( |
70 _(b'unexpected lfs pointer value: %s=%s') |
70 _(b'unexpected lfs pointer value: %s=%s') |
71 % (k, stringutil.pprint(v)) |
71 % (k, stringutil.pprint(v)) |