Show More
@@ -405,7 +405,8 b' def debuglfsupload(ui, repo, **opts):' | |||||
405 |
|
405 | |||
406 |
|
406 | |||
407 | @eh.wrapcommand( |
|
407 | @eh.wrapcommand( | |
408 | b'verify', opts=[(b'', b'no-lfs', None, _(b'skip all lfs blob content'))] |
|
408 | b'verify', | |
|
409 | opts=[(b'', b'no-lfs', None, _(b'skip missing lfs blob content'))], | |||
409 | ) |
|
410 | ) | |
410 | def verify(orig, ui, repo, **opts): |
|
411 | def verify(orig, ui, repo, **opts): | |
411 | skipflags = repo.ui.configint(b'verify', b'skipflags') |
|
412 | skipflags = repo.ui.configint(b'verify', b'skipflags') |
@@ -225,6 +225,21 b' def filelogsize(orig, self, rev):' | |||||
225 | return orig(self, rev) |
|
225 | return orig(self, rev) | |
226 |
|
226 | |||
227 |
|
227 | |||
|
228 | @eh.wrapfunction(revlog, b'_verify_revision') | |||
|
229 | def _verify_revision(orig, rl, skipflags, state, node): | |||
|
230 | if _islfs(rl, node=node): | |||
|
231 | rawtext = rl.rawdata(node) | |||
|
232 | metadata = pointer.deserialize(rawtext) | |||
|
233 | ||||
|
234 | # Don't skip blobs that are stored locally, as local verification is | |||
|
235 | # relatively cheap and there's no other way to verify the raw data in | |||
|
236 | # the revlog. | |||
|
237 | if rl.opener.lfslocalblobstore.has(metadata.oid()): | |||
|
238 | skipflags &= ~revlog.REVIDX_EXTSTORED | |||
|
239 | ||||
|
240 | orig(rl, skipflags, state, node) | |||
|
241 | ||||
|
242 | ||||
228 | @eh.wrapfunction(context.basefilectx, b'cmp') |
|
243 | @eh.wrapfunction(context.basefilectx, b'cmp') | |
229 | def filectxcmp(orig, self, fctx): |
|
244 | def filectxcmp(orig, self, fctx): | |
230 | """returns True if text is different than fctx""" |
|
245 | """returns True if text is different than fctx""" |
@@ -804,6 +804,7 b' Verify will not try to download lfs blob' | |||||
804 | checking manifests |
|
804 | checking manifests | |
805 | crosschecking files in changesets and manifests |
|
805 | crosschecking files in changesets and manifests | |
806 | checking files |
|
806 | checking files | |
|
807 | lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store | |||
807 | checked 5 changesets with 10 changes to 4 files |
|
808 | checked 5 changesets with 10 changes to 4 files | |
808 |
|
809 | |||
809 | Verify will not try to download lfs blobs, if told not to by the config option |
|
810 | Verify will not try to download lfs blobs, if told not to by the config option | |
@@ -815,6 +816,7 b' Verify will not try to download lfs blob' | |||||
815 | checking manifests |
|
816 | checking manifests | |
816 | crosschecking files in changesets and manifests |
|
817 | crosschecking files in changesets and manifests | |
817 | checking files |
|
818 | checking files | |
|
819 | lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store | |||
818 | checked 5 changesets with 10 changes to 4 files |
|
820 | checked 5 changesets with 10 changes to 4 files | |
819 |
|
821 | |||
820 | Verify will copy/link all lfs objects into the local store that aren't already |
|
822 | Verify will copy/link all lfs objects into the local store that aren't already |
General Comments 0
You need to be logged in to leave comments.
Login now