Show More
@@ -213,6 +213,7 b' def callcatch(ui, func):' | |||||
213 | ui.error(_(b"abort: %s\n") % inst) |
|
213 | ui.error(_(b"abort: %s\n") % inst) | |
214 | if inst.hint: |
|
214 | if inst.hint: | |
215 | ui.error(_(b"(%s)\n") % inst.hint) |
|
215 | ui.error(_(b"(%s)\n") % inst.hint) | |
|
216 | detailed_exit_code = 50 | |||
216 | except error.InterventionRequired as inst: |
|
217 | except error.InterventionRequired as inst: | |
217 | ui.error(b"%s\n" % inst) |
|
218 | ui.error(b"%s\n" % inst) | |
218 | if inst.hint: |
|
219 | if inst.hint: |
@@ -224,7 +224,7 b' revision 2' | |||||
224 | transaction abort! |
|
224 | transaction abort! | |
225 | rollback completed |
|
225 | rollback completed | |
226 | abort: 00changelog.i@93ee6ab32777: unknown parent |
|
226 | abort: 00changelog.i@93ee6ab32777: unknown parent | |
227 |
[ |
|
227 | [50] | |
228 |
|
228 | |||
229 | revision 2 |
|
229 | revision 2 | |
230 |
|
230 |
@@ -734,7 +734,7 b' partial history bundle, fails w/ unknown' | |||||
734 |
|
734 | |||
735 | $ hg -R bundle.hg verify |
|
735 | $ hg -R bundle.hg verify | |
736 | abort: 00changelog.i@bbd179dfa0a7: unknown parent |
|
736 | abort: 00changelog.i@bbd179dfa0a7: unknown parent | |
737 |
[ |
|
737 | [50] | |
738 |
|
738 | |||
739 | full history bundle, refuses to verify non-local repo |
|
739 | full history bundle, refuses to verify non-local repo | |
740 |
|
740 |
@@ -103,7 +103,7 b'' | |||||
103 | transaction abort! |
|
103 | transaction abort! | |
104 | rollback completed |
|
104 | rollback completed | |
105 | abort: empty username |
|
105 | abort: empty username | |
106 |
[ |
|
106 | [50] | |
107 |
|
107 | |||
108 | # don't add tests here, previous test is unstable |
|
108 | # don't add tests here, previous test is unstable | |
109 |
|
109 |
@@ -294,7 +294,7 b' ensure that the filemap contains duplica' | |||||
294 | $ hg -q convert --filemap renames.fmap --datesort source dummydest |
|
294 | $ hg -q convert --filemap renames.fmap --datesort source dummydest | |
295 | abort: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !) |
|
295 | abort: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !) | |
296 | abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) |
|
296 | abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) | |
297 |
[ |
|
297 | [50] | |
298 | $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo |
|
298 | $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo | |
299 | ignoring: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !) |
|
299 | ignoring: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !) | |
300 | ignoring: data/dir/file4.i@6edd55f559cd: no match found (reporevlogstore !) |
|
300 | ignoring: data/dir/file4.i@6edd55f559cd: no match found (reporevlogstore !) |
@@ -190,7 +190,7 b' Ensure the data got to the server OK' | |||||
190 | $ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop |
|
190 | $ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop | |
191 | $ hg commit -Aqm 'fail+base64+gzip+noop' |
|
191 | $ hg commit -Aqm 'fail+base64+gzip+noop' | |
192 | abort: missing processor for flag '0x1' |
|
192 | abort: missing processor for flag '0x1' | |
193 |
[ |
|
193 | [50] | |
194 | $ rm fail-base64-gzip-noop |
|
194 | $ rm fail-base64-gzip-noop | |
195 |
|
195 | |||
196 | # TEST: ensure we cannot register several flag processors on the same flag |
|
196 | # TEST: ensure we cannot register several flag processors on the same flag |
@@ -1019,7 +1019,7 b' follow revision history from wdir:' | |||||
1019 | add0-cp4-mod4:2147483647:+:data4 |
|
1019 | add0-cp4-mod4:2147483647:+:data4 | |
1020 | add0-mod4:2147483647:+:data4 |
|
1020 | add0-mod4:2147483647:+:data4 | |
1021 | add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest |
|
1021 | add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest | |
1022 |
[ |
|
1022 | [50] | |
1023 |
|
1023 | |||
1024 | $ hg grep -fr'wdir()' data |
|
1024 | $ hg grep -fr'wdir()' data | |
1025 | add0:2147483647:data0 |
|
1025 | add0:2147483647:data0 |
@@ -33,10 +33,10 b' test custom revlog chunk cache sizes' | |||||
33 |
|
33 | |||
34 | $ hg --config format.chunkcachesize=0 log -R local -pv |
|
34 | $ hg --config format.chunkcachesize=0 log -R local -pv | |
35 | abort: revlog chunk cache size 0 is not greater than 0 |
|
35 | abort: revlog chunk cache size 0 is not greater than 0 | |
36 |
[ |
|
36 | [50] | |
37 | $ hg --config format.chunkcachesize=1023 log -R local -pv |
|
37 | $ hg --config format.chunkcachesize=1023 log -R local -pv | |
38 | abort: revlog chunk cache size 1023 is not a power of 2 |
|
38 | abort: revlog chunk cache size 1023 is not a power of 2 | |
39 |
[ |
|
39 | [50] | |
40 | $ hg --config format.chunkcachesize=1024 log -R local -pv |
|
40 | $ hg --config format.chunkcachesize=1024 log -R local -pv | |
41 | changeset: 0:08b9e9f63b32 |
|
41 | changeset: 0:08b9e9f63b32 | |
42 | tag: tip |
|
42 | tag: tip |
@@ -32,7 +32,7 b' Uploads fail...' | |||||
32 | searching for changes |
|
32 | searching for changes | |
33 | abort: LFS HTTP error: HTTP Error 400: no such method: .git |
|
33 | abort: LFS HTTP error: HTTP Error 400: no such method: .git | |
34 | (check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "upload" is supported) |
|
34 | (check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "upload" is supported) | |
35 |
[ |
|
35 | [50] | |
36 |
|
36 | |||
37 | ... so do a local push to make the data available. Remove the blob from the |
|
37 | ... so do a local push to make the data available. Remove the blob from the | |
38 | default cache, so it attempts to download. |
|
38 | default cache, so it attempts to download. | |
@@ -54,7 +54,7 b' Downloads fail...' | |||||
54 | updating to branch default |
|
54 | updating to branch default | |
55 | abort: LFS HTTP error: HTTP Error 400: no such method: .git |
|
55 | abort: LFS HTTP error: HTTP Error 400: no such method: .git | |
56 | (check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "download" is supported) |
|
56 | (check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "download" is supported) | |
57 |
[ |
|
57 | [50] | |
58 |
|
58 | |||
59 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS |
|
59 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS | |
60 |
|
60 | |||
@@ -80,14 +80,14 b' Reasonable hint for a misconfigured blob' | |||||
80 | $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT/missing |
|
80 | $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT/missing | |
81 | abort: LFS HTTP error: HTTP Error 404: Not Found |
|
81 | abort: LFS HTTP error: HTTP Error 404: Not Found | |
82 | (the "lfs.url" config may be used to override http://localhost:$HGPORT/missing) |
|
82 | (the "lfs.url" config may be used to override http://localhost:$HGPORT/missing) | |
83 |
[ |
|
83 | [50] | |
84 |
|
84 | |||
85 | $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT2/missing |
|
85 | $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT2/missing | |
86 | abort: LFS error: *onnection *refused* (glob) (?) |
|
86 | abort: LFS error: *onnection *refused* (glob) (?) | |
87 | abort: LFS error: $EADDRNOTAVAIL$ (glob) (?) |
|
87 | abort: LFS error: $EADDRNOTAVAIL$ (glob) (?) | |
88 | abort: LFS error: No route to host (?) |
|
88 | abort: LFS error: No route to host (?) | |
89 | (the "lfs.url" config may be used to override http://localhost:$HGPORT2/missing) |
|
89 | (the "lfs.url" config may be used to override http://localhost:$HGPORT2/missing) | |
90 |
[ |
|
90 | [50] | |
91 |
|
91 | |||
92 | Blob URIs are correct when --prefix is used |
|
92 | Blob URIs are correct when --prefix is used | |
93 |
|
93 | |||
@@ -267,7 +267,7 b' Test an I/O error in localstore.verify()' | |||||
267 | new changesets 525251863cad |
|
267 | new changesets 525251863cad | |
268 | updating to branch default |
|
268 | updating to branch default | |
269 | abort: LFS server error for "lfs.bin": Internal server error |
|
269 | abort: LFS server error for "lfs.bin": Internal server error | |
270 |
[ |
|
270 | [50] | |
271 |
|
271 | |||
272 | Test an I/O error in localstore.verify() (Batch API) with PUT |
|
272 | Test an I/O error in localstore.verify() (Batch API) with PUT | |
273 |
|
273 | |||
@@ -277,7 +277,7 b' Test an I/O error in localstore.verify()' | |||||
277 | pushing to http://localhost:$HGPORT1/ |
|
277 | pushing to http://localhost:$HGPORT1/ | |
278 | searching for changes |
|
278 | searching for changes | |
279 | abort: LFS server error for "unknown": Internal server error |
|
279 | abort: LFS server error for "unknown": Internal server error | |
280 |
[ |
|
280 | [50] | |
281 | TODO: figure out how to associate the file name in the error above |
|
281 | TODO: figure out how to associate the file name in the error above | |
282 |
|
282 | |||
283 | Test a bad checksum sent by the client in the transfer API |
|
283 | Test a bad checksum sent by the client in the transfer API | |
@@ -286,7 +286,7 b' Test a bad checksum sent by the client i' | |||||
286 | pushing to http://localhost:$HGPORT1/ |
|
286 | pushing to http://localhost:$HGPORT1/ | |
287 | searching for changes |
|
287 | searching for changes | |
288 | abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c, action=upload) |
|
288 | abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c, action=upload) | |
289 |
[ |
|
289 | [50] | |
290 |
|
290 | |||
291 | $ echo 'test lfs file' > server/lfs3.bin |
|
291 | $ echo 'test lfs file' > server/lfs3.bin | |
292 | $ hg --config experimental.lfs.disableusercache=True \ |
|
292 | $ hg --config experimental.lfs.disableusercache=True \ | |
@@ -298,14 +298,14 b' Test an I/O error during the processing ' | |||||
298 | $ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \ |
|
298 | $ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \ | |
299 | > -R client update -r tip |
|
299 | > -R client update -r tip | |
300 | abort: LFS HTTP error: HTTP Error 500: Internal Server Error (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download) |
|
300 | abort: LFS HTTP error: HTTP Error 500: Internal Server Error (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download) | |
301 |
[ |
|
301 | [50] | |
302 |
|
302 | |||
303 | Test a checksum failure during the processing of the GET request |
|
303 | Test a checksum failure during the processing of the GET request | |
304 |
|
304 | |||
305 | $ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \ |
|
305 | $ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \ | |
306 | > -R client update -r tip |
|
306 | > -R client update -r tip | |
307 | abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download) |
|
307 | abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download) | |
308 |
[ |
|
308 | [50] | |
309 |
|
309 | |||
310 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS |
|
310 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS | |
311 |
|
311 | |||
@@ -453,7 +453,7 b' Test that Digest Auth fails gracefully b' | |||||
453 | searching for changes |
|
453 | searching for changes | |
454 | abort: LFS HTTP error: HTTP Error 401: the server must support Basic Authentication |
|
454 | abort: LFS HTTP error: HTTP Error 401: the server must support Basic Authentication | |
455 | (api=http://localhost:$HGPORT1/.git/info/lfs/objects/batch, action=upload) |
|
455 | (api=http://localhost:$HGPORT1/.git/info/lfs/objects/batch, action=upload) | |
456 |
[ |
|
456 | [50] | |
457 |
|
457 | |||
458 | $ hg -R auth_clone --debug push | egrep '^[{}]| ' |
|
458 | $ hg -R auth_clone --debug push | egrep '^[{}]| ' | |
459 | { |
|
459 | { |
@@ -460,7 +460,7 b' TODO: give the proper error indication f' | |||||
460 | Date: $HTTP_DATE$ (git-server !) |
|
460 | Date: $HTTP_DATE$ (git-server !) | |
461 | abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (git-server !) |
|
461 | abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (git-server !) | |
462 | abort: LFS server error for "c": Validation error (hg-server !) |
|
462 | abort: LFS server error for "c": Validation error (hg-server !) | |
463 |
[ |
|
463 | [50] | |
464 |
|
464 | |||
465 | The corrupted blob is not added to the usercache or local store |
|
465 | The corrupted blob is not added to the usercache or local store | |
466 |
|
466 | |||
@@ -827,7 +827,7 b' Check error message when the remote miss' | |||||
827 | "transfer": "basic" (hg-server !) |
|
827 | "transfer": "basic" (hg-server !) | |
828 | } |
|
828 | } | |
829 | abort: LFS server error for "b": The object does not exist |
|
829 | abort: LFS server error for "b": The object does not exist | |
830 |
[ |
|
830 | [50] | |
831 |
|
831 | |||
832 | Check error message when object does not exist: |
|
832 | Check error message when object does not exist: | |
833 |
|
833 | |||
@@ -938,6 +938,6 b' Check error message when object does not' | |||||
938 | "transfer": "basic" (hg-server !) |
|
938 | "transfer": "basic" (hg-server !) | |
939 | } |
|
939 | } | |
940 | abort: LFS server error for "a": The object does not exist |
|
940 | abort: LFS server error for "a": The object does not exist | |
941 |
[ |
|
941 | [50] | |
942 |
|
942 | |||
943 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS |
|
943 | $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS |
@@ -986,7 +986,7 b' Accessing a corrupt file will complain' | |||||
986 |
|
986 | |||
987 | $ hg --cwd fromcorrupt2 cat -r 0 large |
|
987 | $ hg --cwd fromcorrupt2 cat -r 0 large | |
988 | abort: integrity check failed on data/large.i:0 |
|
988 | abort: integrity check failed on data/large.i:0 | |
989 |
[ |
|
989 | [50] | |
990 |
|
990 | |||
991 | lfs -> normal -> lfs round trip conversions are possible. The 'none()' |
|
991 | lfs -> normal -> lfs round trip conversions are possible. The 'none()' | |
992 | predicate on the command line will override whatever is configured globally and |
|
992 | predicate on the command line will override whatever is configured globally and |
@@ -505,7 +505,7 b' but only after writing the bad name into' | |||||
505 | rollback completed |
|
505 | rollback completed | |
506 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
506 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) | |
507 | abort: username 'foo\nbar' contains a newline |
|
507 | abort: username 'foo\nbar' contains a newline | |
508 |
[ |
|
508 | [50] | |
509 | $ rm a |
|
509 | $ rm a | |
510 | $ cat .hg/patches/a |
|
510 | $ cat .hg/patches/a | |
511 | # HG changeset patch |
|
511 | # HG changeset patch | |
@@ -521,7 +521,7 b' but only after writing the bad name into' | |||||
521 | rollback completed |
|
521 | rollback completed | |
522 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) |
|
522 | qrefresh interrupted while patch was popped! (revert --all, qpush to recover) | |
523 | abort: empty username |
|
523 | abort: empty username | |
524 |
[ |
|
524 | [50] | |
525 | $ cat .hg/patches/a |
|
525 | $ cat .hg/patches/a | |
526 | # HG changeset patch |
|
526 | # HG changeset patch | |
527 | # Parent 0000000000000000000000000000000000000000 |
|
527 | # Parent 0000000000000000000000000000000000000000 |
@@ -186,7 +186,7 b' Test recovery from misconfigured server ' | |||||
186 | adding manifests |
|
186 | adding manifests | |
187 | adding file changes |
|
187 | adding file changes | |
188 | abort: 00changelog.i@66f7d451a68b: no node |
|
188 | abort: 00changelog.i@66f7d451a68b: no node | |
189 |
[ |
|
189 | [50] | |
190 | $ cd .. |
|
190 | $ cd .. | |
191 | $ killdaemons.py |
|
191 | $ killdaemons.py | |
192 | $ grep 'sending pullbundle ' repo/.hg/blackbox.log |
|
192 | $ grep 'sending pullbundle ' repo/.hg/blackbox.log |
@@ -6,7 +6,7 b'' | |||||
6 | $ rm .hg/requires |
|
6 | $ rm .hg/requires | |
7 | $ hg tip |
|
7 | $ hg tip | |
8 | abort: unknown version (2) in revlog 00changelog.i |
|
8 | abort: unknown version (2) in revlog 00changelog.i | |
9 |
[ |
|
9 | [50] | |
10 | $ echo indoor-pool > .hg/requires |
|
10 | $ echo indoor-pool > .hg/requires | |
11 | $ hg tip |
|
11 | $ hg tip | |
12 | abort: repository requires features unknown to this Mercurial: indoor-pool |
|
12 | abort: repository requires features unknown to this Mercurial: indoor-pool |
@@ -36,7 +36,7 b' Unknown flags to revlog are rejected' | |||||
36 |
|
36 | |||
37 | $ hg log |
|
37 | $ hg log | |
38 | abort: unknown flags (0xff00) in version 57005 revlog 00changelog.i |
|
38 | abort: unknown flags (0xff00) in version 57005 revlog 00changelog.i | |
39 |
[ |
|
39 | [50] | |
40 |
|
40 | |||
41 | $ cd .. |
|
41 | $ cd .. | |
42 |
|
42 |
@@ -8,7 +8,7 b' Flags on revlog version 0 are rejected' | |||||
8 |
|
8 | |||
9 | $ hg log |
|
9 | $ hg log | |
10 | abort: unknown flags (0x01) in version 0 revlog 00changelog.i |
|
10 | abort: unknown flags (0x01) in version 0 revlog 00changelog.i | |
11 |
[ |
|
11 | [50] | |
12 |
|
12 | |||
13 | Unknown flags on revlog version 1 are rejected |
|
13 | Unknown flags on revlog version 1 are rejected | |
14 |
|
14 | |||
@@ -17,7 +17,7 b' Unknown flags on revlog version 1 are re' | |||||
17 |
|
17 | |||
18 | $ hg log |
|
18 | $ hg log | |
19 | abort: unknown flags (0x04) in version 1 revlog 00changelog.i |
|
19 | abort: unknown flags (0x04) in version 1 revlog 00changelog.i | |
20 |
[ |
|
20 | [50] | |
21 |
|
21 | |||
22 | Unknown version is rejected |
|
22 | Unknown version is rejected | |
23 |
|
23 | |||
@@ -26,7 +26,7 b' Unknown version is rejected' | |||||
26 |
|
26 | |||
27 | $ hg log |
|
27 | $ hg log | |
28 | abort: unknown version (2) in revlog 00changelog.i |
|
28 | abort: unknown version (2) in revlog 00changelog.i | |
29 |
[ |
|
29 | [50] | |
30 |
|
30 | |||
31 | $ cd .. |
|
31 | $ cd .. | |
32 |
|
32 |
General Comments 0
You need to be logged in to leave comments.
Login now