Show More
@@ -44,6 +44,7 b' from .revlogutils.constants import (' | |||
|
44 | 44 | FLAG_INLINE_DATA, |
|
45 | 45 | INDEX_HEADER, |
|
46 | 46 | KIND_CHANGELOG, |
|
47 | KIND_FILELOG, | |
|
47 | 48 | RANK_UNKNOWN, |
|
48 | 49 | REVLOGV0, |
|
49 | 50 | REVLOGV1, |
@@ -652,9 +653,12 b' class revlog:' | |||
|
652 | 653 | @util.propertycache |
|
653 | 654 | def display_id(self): |
|
654 | 655 | """The public facing "ID" of the revlog that we use in message""" |
|
655 | # Maybe we should build a user facing representation of | |
|
656 | # revlog.target instead of using `self.radix` | |
|
657 | return self.radix | |
|
656 | if self.revlog_kind == KIND_FILELOG: | |
|
657 | # Reference the file without the "data/" prefix, so it is familiar | |
|
658 | # to the user. | |
|
659 | return self.target[1] | |
|
660 | else: | |
|
661 | return self.radix | |
|
658 | 662 | |
|
659 | 663 | def _get_decompressor(self, t): |
|
660 | 664 | try: |
@@ -292,12 +292,12 b' ensure that the filemap contains duplica' | |||
|
292 | 292 | $ rm -rf source/.hg/store/data/dir/file4 |
|
293 | 293 | #endif |
|
294 | 294 | $ hg -q convert --filemap renames.fmap --datesort source dummydest |
|
295 |
abort: |
|
|
295 | abort: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !) | |
|
296 | 296 | abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) |
|
297 | 297 | [50] |
|
298 | 298 | $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo |
|
299 |
ignoring: |
|
|
300 |
ignoring: |
|
|
299 | ignoring: dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !) | |
|
300 | ignoring: dir/file4@6edd55f559cdce67132b12ca09e09cee08b60442: no match found (reporevlogstore !) | |
|
301 | 301 | ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) |
|
302 | 302 | ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !) |
|
303 | 303 | $ hg up -q -R renames.repo |
@@ -182,7 +182,7 b' break it' | |||
|
182 | 182 | sorting... |
|
183 | 183 | converting... |
|
184 | 184 | 4 init |
|
185 |
ignoring: |
|
|
185 | ignoring: b@1e88685f5ddec574a34c70af492f95b6debc8741: no match found (reporevlogstore !) | |
|
186 | 186 | ignoring: data/b/index@1e88685f5dde: no node (reposimplestore !) |
|
187 | 187 | 3 changeall |
|
188 | 188 | 2 changebagain |
@@ -787,8 +787,8 b' Repo with damaged lfs objects in any rev' | |||
|
787 | 787 | checking manifests |
|
788 | 788 | crosschecking files in changesets and manifests |
|
789 | 789 | checking files |
|
790 |
l@1: unpacking 46a2f24864bc: integrity check failed on |
|
|
791 |
large@0: unpacking 2c531e0992ff: integrity check failed on |
|
|
790 | l@1: unpacking 46a2f24864bc: integrity check failed on l:0 | |
|
791 | large@0: unpacking 2c531e0992ff: integrity check failed on large:0 | |
|
792 | 792 | checked 5 changesets with 10 changes to 4 files |
|
793 | 793 | 2 integrity errors encountered! |
|
794 | 794 | (first damaged changeset appears to be 0) |
@@ -897,9 +897,9 b' store, and poison it. (The verify with ' | |||
|
897 | 897 | checking manifests |
|
898 | 898 | crosschecking files in changesets and manifests |
|
899 | 899 | checking files |
|
900 |
l@1: unpacking 46a2f24864bc: integrity check failed on |
|
|
900 | l@1: unpacking 46a2f24864bc: integrity check failed on l:0 | |
|
901 | 901 | lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store |
|
902 |
large@0: unpacking 2c531e0992ff: integrity check failed on |
|
|
902 | large@0: unpacking 2c531e0992ff: integrity check failed on large:0 | |
|
903 | 903 | lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store |
|
904 | 904 | lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store |
|
905 | 905 | checked 5 changesets with 10 changes to 4 files |
@@ -941,8 +941,8 b' usercache or local store.' | |||
|
941 | 941 | checking manifests |
|
942 | 942 | crosschecking files in changesets and manifests |
|
943 | 943 | checking files |
|
944 |
l@1: unpacking 46a2f24864bc: integrity check failed on |
|
|
945 |
large@0: unpacking 2c531e0992ff: integrity check failed on |
|
|
944 | l@1: unpacking 46a2f24864bc: integrity check failed on l:0 | |
|
945 | large@0: unpacking 2c531e0992ff: integrity check failed on large:0 | |
|
946 | 946 | checked 5 changesets with 10 changes to 4 files |
|
947 | 947 | 2 integrity errors encountered! |
|
948 | 948 | (first damaged changeset appears to be 0) |
@@ -967,9 +967,9 b' avoids the corrupt lfs object in the ori' | |||
|
967 | 967 | checking manifests |
|
968 | 968 | crosschecking files in changesets and manifests |
|
969 | 969 | checking files |
|
970 |
l@1: unpacking 46a2f24864bc: integrity check failed on |
|
|
970 | l@1: unpacking 46a2f24864bc: integrity check failed on l:0 | |
|
971 | 971 | lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store |
|
972 |
large@0: unpacking 2c531e0992ff: integrity check failed on |
|
|
972 | large@0: unpacking 2c531e0992ff: integrity check failed on large:0 | |
|
973 | 973 | lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store |
|
974 | 974 | lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store |
|
975 | 975 | checked 5 changesets with 10 changes to 4 files |
@@ -987,7 +987,7 b' avoids the corrupt lfs object in the ori' | |||
|
987 | 987 | Accessing a corrupt file will complain |
|
988 | 988 | |
|
989 | 989 | $ hg --cwd fromcorrupt2 cat -r 0 large |
|
990 |
abort: integrity check failed on |
|
|
990 | abort: integrity check failed on large:0 | |
|
991 | 991 | [50] |
|
992 | 992 | |
|
993 | 993 | lfs -> normal -> lfs round trip conversions are possible. The 'none()' |
@@ -218,8 +218,8 b" TODO: lfs shouldn't abort like this" | |||
|
218 | 218 | remote: adding manifests |
|
219 | 219 | remote: adding file changes |
|
220 | 220 | remote: added 1 changesets with 0 changes to 0 files (no-lfs-on !) |
|
221 |
remote: error: pretxnchangegroup.lfs hook raised an exception: |
|
|
221 | remote: error: pretxnchangegroup.lfs hook raised an exception: inside2/f@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !) | |
|
222 | 222 | remote: transaction abort! (lfs-on !) |
|
223 | 223 | remote: rollback completed (lfs-on !) |
|
224 |
remote: abort: |
|
|
224 | remote: abort: inside2/f@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !) | |
|
225 | 225 | abort: stream ended unexpectedly (got 0 bytes, expected 4) (lfs-on !) |
@@ -297,7 +297,7 b' test revlog corruption' | |||
|
297 | 297 | checking manifests |
|
298 | 298 | crosschecking files in changesets and manifests |
|
299 | 299 | checking files |
|
300 |
a@1: broken revlog! (index |
|
|
300 | a@1: broken revlog! (index a is corrupted) | |
|
301 | 301 | warning: orphan data file 'data/a.i' |
|
302 | 302 | checked 2 changesets with 0 changes to 1 files |
|
303 | 303 | 1 warnings encountered! |
@@ -350,7 +350,7 b' test flag processor and skipflags' | |||
|
350 | 350 | checking manifests |
|
351 | 351 | crosschecking files in changesets and manifests |
|
352 | 352 | checking files |
|
353 |
base64@0: unpacking 794cee7777cb: integrity check failed on |
|
|
353 | base64@0: unpacking 794cee7777cb: integrity check failed on base64:0 | |
|
354 | 354 | checked 1 changesets with 1 changes to 1 files |
|
355 | 355 | 1 integrity errors encountered! |
|
356 | 356 | (first damaged changeset appears to be 0) |
General Comments 0
You need to be logged in to leave comments.
Login now