Mercurial > public > mercurial-scm > hg-stable

diff hgext/lfs/pointer.py @ 38194:aa10675c5dd6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lfs: clarify pointer validation error messages It wasn't obvious that LFS was involved from the error messages when `hg verify` fails.
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 26 Apr 2018 23:00:19 -0400
parents 32bc3815efae
children 67dc32d4e790
line wrap: on
line diff
--- a/hgext/lfs/pointer.py	Tue May 22 23:22:15 2018 -0400
+++ b/hgext/lfs/pointer.py	Thu Apr 26 23:00:19 2018 -0400
@@ -65,17 +65,19 @@
         for k, v in self.iteritems():
             if k in self._requiredre:
                 if not self._requiredre[k].match(v):
-                    raise InvalidPointer(_('unexpected value: %s=%s')
-                                         % (k, stringutil.pprint(v)))
+                    raise InvalidPointer(
+                        _('unexpected lfs pointer value: %s=%s')
+                        % (k, stringutil.pprint(v)))
                 requiredcount += 1
             elif not self._keyre.match(k):
-                raise InvalidPointer(_('unexpected key: %s') % k)
+                raise InvalidPointer(_('unexpected lfs pointer key: %s') % k)
             if not self._valuere.match(v):
-                raise InvalidPointer(_('unexpected value: %s=%s')
+                raise InvalidPointer(_('unexpected lfs pointer value: %s=%s')
                                      % (k, stringutil.pprint(v)))
         if len(self._requiredre) != requiredcount:
             miss = sorted(set(self._requiredre.keys()).difference(self.keys()))
-            raise InvalidPointer(_('missed keys: %s') % ', '.join(miss))
+            raise InvalidPointer(_('missing lfs pointer keys: %s')
+                                 % ', '.join(miss))
         return self
 
 deserialize = gitlfspointer.deserialize