lfs: stabilize error message values for Python 2 and 3
Differential Revision: https://phab.mercurial-scm.org/D3513
--- a/hgext/lfs/pointer.py Fri Apr 27 11:59:21 2018 -0400
+++ b/hgext/lfs/pointer.py Fri Apr 27 12:07:32 2018 -0400
@@ -15,6 +15,9 @@
error,
pycompat,
)
+from mercurial.utils import (
+ stringutil,
+)
class InvalidPointer(error.RevlogError):
pass
@@ -32,7 +35,9 @@
try:
return cls(l.split(' ', 1) for l in text.splitlines()).validate()
except ValueError: # l.split returns 1 item instead of 2
- raise InvalidPointer(_('cannot parse git-lfs text: %r') % text)
+ raise InvalidPointer(
+ _('cannot parse git-lfs text: %s') % stringutil.pprint(
+ text, bprefix=False))
def serialize(self):
sortkeyfunc = lambda x: (x[0] != 'version', x)
@@ -61,12 +66,14 @@
for k, v in self.iteritems():
if k in self._requiredre:
if not self._requiredre[k].match(v):
- raise InvalidPointer(_('unexpected value: %s=%r') % (k, v))
+ raise InvalidPointer(_('unexpected value: %s=%s') % (
+ k, stringutil.pprint(v, bprefix=False)))
requiredcount += 1
elif not self._keyre.match(k):
raise InvalidPointer(_('unexpected key: %s') % k)
if not self._valuere.match(v):
- raise InvalidPointer(_('unexpected value: %s=%r') % (k, v))
+ raise InvalidPointer(_('unexpected value: %s=%s') % (
+ k, stringutil.pprint(v, bprefix=False)))
if len(self._requiredre) != requiredcount:
miss = sorted(set(self._requiredre.keys()).difference(self.keys()))
raise InvalidPointer(_('missed keys: %s') % ', '.join(miss))