This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9601

errors: use detailed exit code 50 for StorageError
ClosedPublic

Authored by martinvonz on Dec 14 2020, 4:31 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG17a695357270: errors: use detailed exit code 50 for StorageError
Summary

This is done as part of
https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Dec 14 2020, 4:31 PM
mharbison72 added a subscriber: mharbison72.Dec 15 2020, 10:46 PM

Many of the LFS errors feel weird too, because they are explicitly mentioning the remote server. I didn't check, but I suspect that this is because it's being raised in the filelog wrapper, so a remote error isn't appropriate? The wiki page talked about IOError and file corruption, so I probably went into this with too narrow of a view on the storage layer. I'm not worried about it, but I thought I'd point it out.

tests/test-committer.t
105

Weird, this seems like it's a config or input error. But since it was already like this and just changing the exit code, I'll keep going and queue it. (There are a couple more instances of this in test-mq-qrefresh.t.)

mharbison72 accepted this revision.Dec 15 2020, 10:59 PM
This revision is now accepted and ready to land.Dec 15 2020, 10:59 PM
martinvonz added a commit: rHG17a695357270: errors: use detailed exit code 50 for StorageError.Dec 15 2020, 11:32 PM
Closed by commit rHG17a695357270: errors: use detailed exit code 50 for StorageError (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
mharbison72 added inline comments.Jan 16 2021, 8:30 PM
tests/test-lfs-test-server.t
463

Any thoughts on why this is exiting with 255 on Windows, but not elsewhere? (It appears to be a py3 only failure)

martinvonz added inline comments.Jan 17 2021, 1:56 AM
tests/test-lfs-test-server.t
463

Maybe line 37 in this file? Does it happen only in the #git-server case? I barely know anything about LFS, so maybe my guess is completely off (I don't know what that spawn.py scripts is about). I don't have access to a Windows machine, so do you think you can fix it?

Revision Contents
Changeset List

Diff 24292

mercurial/scmutil.py

else: else:
ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg))) ui.error(b"\n%r\n" % pycompat.bytestr(stringutil.ellipsis(msg)))
except error.CensoredNodeError as inst: except error.CensoredNodeError as inst:
ui.error(_(b"abort: file censored %s\n") % inst) ui.error(_(b"abort: file censored %s\n") % inst)
except error.StorageError as inst: except error.StorageError as inst:
ui.error(_(b"abort: %s\n") % inst) ui.error(_(b"abort: %s\n") % inst)
if inst.hint: if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint) ui.error(_(b"(%s)\n") % inst.hint)
detailed_exit_code = 50
except error.InterventionRequired as inst: except error.InterventionRequired as inst:
ui.error(b"%s\n" % inst) ui.error(b"%s\n" % inst)
if inst.hint: if inst.hint:
ui.error(_(b"(%s)\n") % inst.hint) ui.error(_(b"(%s)\n") % inst.hint)
detailed_exit_code = 240 detailed_exit_code = 240
coarse_exit_code = 1 coarse_exit_code = 1
except error.WdirUnsupported: except error.WdirUnsupported:
ui.error(_(b"abort: working directory revision cannot be specified\n")) ui.error(_(b"abort: working directory revision cannot be specified\n"))

tests/test-bundle-r.t

$ hg tip -q $ hg tip -q
2:4ce51a113780 2:4ce51a113780
$ hg unbundle ../test-bundle-should-fail.hg $ hg unbundle ../test-bundle-should-fail.hg
adding changesets adding changesets
transaction abort! transaction abort!
rollback completed rollback completed
abort: 00changelog.i@93ee6ab32777: unknown parent abort: 00changelog.i@93ee6ab32777: unknown parent
[255] [50]
revision 2 revision 2
$ hg tip -q $ hg tip -q
2:4ce51a113780 2:4ce51a113780
$ hg unbundle ../test-bundle-all.hg $ hg unbundle ../test-bundle-all.hg
adding changesets adding changesets
adding manifests adding manifests

tests/test-bundle.t

test for https://bz.mercurial-scm.org/1144 test for https://bz.mercurial-scm.org/1144
test that verify bundle does not traceback test that verify bundle does not traceback
partial history bundle, fails w/ unknown parent partial history bundle, fails w/ unknown parent
$ hg -R bundle.hg verify $ hg -R bundle.hg verify
abort: 00changelog.i@bbd179dfa0a7: unknown parent abort: 00changelog.i@bbd179dfa0a7: unknown parent
[255] [50]
full history bundle, refuses to verify non-local repo full history bundle, refuses to verify non-local repo
#if repobundlerepo #if repobundlerepo
$ hg -R all.hg verify $ hg -R all.hg verify
abort: cannot verify bundle or remote repos abort: cannot verify bundle or remote repos
[255] [255]
#endif #endif

tests/test-committer.t

$ rm .hg/hgrc $ rm .hg/hgrc
$ hg commit -m commit-1 2>&1 $ hg commit -m commit-1 2>&1
no username found, using '[^']*' instead (re) no username found, using '[^']*' instead (re)
$ echo space2 > asdf $ echo space2 > asdf
$ hg commit -u ' ' -m commit-1 $ hg commit -u ' ' -m commit-1
transaction abort! transaction abort!
rollback completed rollback completed
abort: empty username abort: empty username
mharbison72Unsubmitted
Not Done

Weird, this seems like it's a config or input error. But since it was already like this and just changing the exit code, I'll keep going and queue it. (There are a couple more instances of this in test-mq-qrefresh.t.)

mharbison72: Weird, this seems like it's a config or input error. But since it was already like this and…
[255] [50]
# don't add tests here, previous test is unstable # don't add tests here, previous test is unstable
$ cd .. $ cd ..

tests/test-convert-filemap.t

#endif #endif
#if reposimplestore #if reposimplestore
$ rm -rf source/.hg/store/data/dir/file3 $ rm -rf source/.hg/store/data/dir/file3
$ rm -rf source/.hg/store/data/dir/file4 $ rm -rf source/.hg/store/data/dir/file4
#endif #endif
$ hg -q convert --filemap renames.fmap --datesort source dummydest $ hg -q convert --filemap renames.fmap --datesort source dummydest
abort: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !) abort: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !)
abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
[255] [50]
$ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
ignoring: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !) ignoring: data/dir/file3.i@e96dce0bc6a2: no match found (reporevlogstore !)
ignoring: data/dir/file4.i@6edd55f559cd: no match found (reporevlogstore !) ignoring: data/dir/file4.i@6edd55f559cd: no match found (reporevlogstore !)
ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !) ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !)
$ hg up -q -R renames.repo $ hg up -q -R renames.repo
$ glog -R renames.repo $ glog -R renames.repo
@ 4 "8: change foo" files: foo2 @ 4 "8: change foo" files: foo2

tests/test-flagprocessor.t

[BASE64][GZIP][NOOP] [BASE64][GZIP][NOOP]
$ hg debugdata base64-gzip-noop 0 $ hg debugdata base64-gzip-noop 0
eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol)
# TEST: ensure a missing processor is handled # TEST: ensure a missing processor is handled
$ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop $ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop
$ hg commit -Aqm 'fail+base64+gzip+noop' $ hg commit -Aqm 'fail+base64+gzip+noop'
abort: missing processor for flag '0x1' abort: missing processor for flag '0x1'
[255] [50]
$ rm fail-base64-gzip-noop $ rm fail-base64-gzip-noop
# TEST: ensure we cannot register several flag processors on the same flag # TEST: ensure we cannot register several flag processors on the same flag
$ cat >> .hg/hgrc << EOF $ cat >> .hg/hgrc << EOF
> [extensions] > [extensions]
> extension=$TESTDIR/flagprocessorext.py > extension=$TESTDIR/flagprocessorext.py
> duplicate=$TESTDIR/flagprocessorext.py > duplicate=$TESTDIR/flagprocessorext.py
> EOF > EOF

tests/test-grep.t

1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1 1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
BROKEN: should not abort because of removed file BROKEN: should not abort because of removed file
$ hg grep --diff -fr'wdir()' data $ hg grep --diff -fr'wdir()' data
add0-cp4-mod4:2147483647:+:data4 add0-cp4-mod4:2147483647:+:data4
add0-mod4:2147483647:+:data4 add0-mod4:2147483647:+:data4
add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest
[255] [50]
$ hg grep -fr'wdir()' data $ hg grep -fr'wdir()' data
add0:2147483647:data0 add0:2147483647:data0
add0-cp1:2147483647:data0 add0-cp1:2147483647:data0
add0-cp1-cp3:2147483647:data0 add0-cp1-cp3:2147483647:data0
add0-cp1-mod1:2147483647:data0 add0-cp1-mod1:2147483647:data0
add0-cp1-mod1:2147483647:data1 add0-cp1-mod1:2147483647:data1
add0-cp1-mod1-cp3-mod3:2147483647:data0 add0-cp1-mod1-cp3-mod3:2147483647:data0

tests/test-init.t

$ echo this > local/foo $ echo this > local/foo
$ hg ci --cwd local -A -m "init" $ hg ci --cwd local -A -m "init"
adding foo adding foo
test custom revlog chunk cache sizes test custom revlog chunk cache sizes
$ hg --config format.chunkcachesize=0 log -R local -pv $ hg --config format.chunkcachesize=0 log -R local -pv
abort: revlog chunk cache size 0 is not greater than 0 abort: revlog chunk cache size 0 is not greater than 0
[255] [50]
$ hg --config format.chunkcachesize=1023 log -R local -pv $ hg --config format.chunkcachesize=1023 log -R local -pv
abort: revlog chunk cache size 1023 is not a power of 2 abort: revlog chunk cache size 1023 is not a power of 2
[255] [50]
$ hg --config format.chunkcachesize=1024 log -R local -pv $ hg --config format.chunkcachesize=1024 log -R local -pv
changeset: 0:08b9e9f63b32 changeset: 0:08b9e9f63b32
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
files: foo files: foo
description: description:
init init

tests/test-lfs-serve-access.t

$ echo 'this-is-an-lfs-file' > client/lfs.bin $ echo 'this-is-an-lfs-file' > client/lfs.bin
$ hg -R client ci -Am 'initial commit' $ hg -R client ci -Am 'initial commit'
adding lfs.bin adding lfs.bin
$ hg -R client push http://localhost:$HGPORT $ hg -R client push http://localhost:$HGPORT
pushing to http://localhost:$HGPORT/ pushing to http://localhost:$HGPORT/
searching for changes searching for changes
abort: LFS HTTP error: HTTP Error 400: no such method: .git abort: LFS HTTP error: HTTP Error 400: no such method: .git
(check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "upload" is supported) (check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "upload" is supported)
[255] [50]
... so do a local push to make the data available. Remove the blob from the ... so do a local push to make the data available. Remove the blob from the
default cache, so it attempts to download. default cache, so it attempts to download.
$ hg --config "lfs.usercache=$TESTTMP/servercache" \ $ hg --config "lfs.usercache=$TESTTMP/servercache" \
> --config "lfs.url=null://" \ > --config "lfs.url=null://" \
> -R client push -q server > -R client push -q server
$ mv `hg config lfs.usercache` $TESTTMP/servercache $ mv `hg config lfs.usercache` $TESTTMP/servercache
Downloads fail... Downloads fail...
$ hg clone http://localhost:$HGPORT httpclone $ hg clone http://localhost:$HGPORT httpclone
(remote is using large file support (lfs); lfs will be enabled for this repository) (remote is using large file support (lfs); lfs will be enabled for this repository)
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 525251863cad new changesets 525251863cad
updating to branch default updating to branch default
abort: LFS HTTP error: HTTP Error 400: no such method: .git abort: LFS HTTP error: HTTP Error 400: no such method: .git
(check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "download" is supported) (check that lfs serving is enabled on http://localhost:$HGPORT/.git/info/lfs and "download" is supported)
[255] [50]
$ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
$ cat $TESTTMP/access.log $TESTTMP/errors.log $ cat $TESTTMP/access.log $TESTTMP/errors.log
$LOCALIP - - [$LOGDATE$] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D525251863cad618e55d483555f3d00a2ca99597e x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D525251863cad618e55d483555f3d00a2ca99597e x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
$LOCALIP - - [$LOGDATE$] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
$LOCALIP - - [$LOGDATE$] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
> -A $TESTTMP/access.log -E $TESTTMP/errors.log > -A $TESTTMP/access.log -E $TESTTMP/errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
Reasonable hint for a misconfigured blob server Reasonable hint for a misconfigured blob server
$ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT/missing $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT/missing
abort: LFS HTTP error: HTTP Error 404: Not Found abort: LFS HTTP error: HTTP Error 404: Not Found
(the "lfs.url" config may be used to override http://localhost:$HGPORT/missing) (the "lfs.url" config may be used to override http://localhost:$HGPORT/missing)
[255] [50]
$ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT2/missing $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT2/missing
abort: LFS error: *onnection *refused* (glob) (?) abort: LFS error: *onnection *refused* (glob) (?)
abort: LFS error: $EADDRNOTAVAIL$ (glob) (?) abort: LFS error: $EADDRNOTAVAIL$ (glob) (?)
abort: LFS error: No route to host (?) abort: LFS error: No route to host (?)
(the "lfs.url" config may be used to override http://localhost:$HGPORT2/missing) (the "lfs.url" config may be used to override http://localhost:$HGPORT2/missing)
[255] [50]
Blob URIs are correct when --prefix is used Blob URIs are correct when --prefix is used
$ hg clone --debug http://localhost:$HGPORT/subdir/mount/point cloned2 $ hg clone --debug http://localhost:$HGPORT/subdir/mount/point cloned2
using http://localhost:$HGPORT/subdir/mount/point using http://localhost:$HGPORT/subdir/mount/point
sending capabilities command sending capabilities command
(remote is using large file support (lfs); lfs will be enabled for this repository) (remote is using large file support (lfs); lfs will be enabled for this repository)
query 1; heads query 1; heads
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets 525251863cad new changesets 525251863cad
updating to branch default updating to branch default
abort: LFS server error for "lfs.bin": Internal server error abort: LFS server error for "lfs.bin": Internal server error
[255] [50]
Test an I/O error in localstore.verify() (Batch API) with PUT Test an I/O error in localstore.verify() (Batch API) with PUT
$ echo foo > client/lfs.bin $ echo foo > client/lfs.bin
$ hg -R client ci -m 'mod lfs' $ hg -R client ci -m 'mod lfs'
$ hg -R client push http://localhost:$HGPORT1 $ hg -R client push http://localhost:$HGPORT1
pushing to http://localhost:$HGPORT1/ pushing to http://localhost:$HGPORT1/
searching for changes searching for changes
abort: LFS server error for "unknown": Internal server error abort: LFS server error for "unknown": Internal server error
[255] [50]
TODO: figure out how to associate the file name in the error above TODO: figure out how to associate the file name in the error above
Test a bad checksum sent by the client in the transfer API Test a bad checksum sent by the client in the transfer API
$ hg -R client push http://localhost:$HGPORT1 $ hg -R client push http://localhost:$HGPORT1
pushing to http://localhost:$HGPORT1/ pushing to http://localhost:$HGPORT1/
searching for changes searching for changes
abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c, action=upload) abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c, action=upload)
[255] [50]
$ echo 'test lfs file' > server/lfs3.bin $ echo 'test lfs file' > server/lfs3.bin
$ hg --config experimental.lfs.disableusercache=True \ $ hg --config experimental.lfs.disableusercache=True \
> -R server ci -Aqm 'another lfs file' > -R server ci -Aqm 'another lfs file'
$ hg -R client pull -q http://localhost:$HGPORT1 $ hg -R client pull -q http://localhost:$HGPORT1
Test an I/O error during the processing of the GET request Test an I/O error during the processing of the GET request
$ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \ $ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \
> -R client update -r tip > -R client update -r tip
abort: LFS HTTP error: HTTP Error 500: Internal Server Error (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download) abort: LFS HTTP error: HTTP Error 500: Internal Server Error (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download)
[255] [50]
Test a checksum failure during the processing of the GET request Test a checksum failure during the processing of the GET request
$ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \ $ hg --config lfs.url=http://localhost:$HGPORT1/.git/info/lfs \
> -R client update -r tip > -R client update -r tip
abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download) abort: LFS HTTP error: HTTP Error 422: corrupt blob (oid=276f73cfd75f9fb519810df5f5d96d6594ca2521abd86cbcd92122f7d51a1f3d, action=download)
[255] [50]
$ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS
$ cat $TESTTMP/access.log $ cat $TESTTMP/access.log
$LOCALIP - - [$LOGDATE$] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
$LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
$LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%252C03%250Acheckheads%253Drelated%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps%250Arev-branch-cache%250Astream%253Dv2&cg=1&common=0000000000000000000000000000000000000000&heads=525251863cad618e55d483555f3d00a2ca99597e&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob) $LOCALIP - - [$LOGDATE$] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%252C03%250Acheckheads%253Drelated%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Aphases%253Dheads%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps%250Arev-branch-cache%250Astream%253Dv2&cg=1&common=0000000000000000000000000000000000000000&heads=525251863cad618e55d483555f3d00a2ca99597e&listkeys=bookmarks&phases=1 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull (glob)
$LOCALIP - - [$LOGDATE$] "POST /.git/info/lfs/objects/batch HTTP/1.1" 200 - (glob) $LOCALIP - - [$LOGDATE$] "POST /.git/info/lfs/objects/batch HTTP/1.1" 200 - (glob)
Test that Digest Auth fails gracefully before testing the successful Basic Auth Test that Digest Auth fails gracefully before testing the successful Basic Auth
$ hg -R auth_clone push --config extensions.x=use_digests.py $ hg -R auth_clone push --config extensions.x=use_digests.py
pushing to http://localhost:$HGPORT1/ pushing to http://localhost:$HGPORT1/
searching for changes searching for changes
abort: LFS HTTP error: HTTP Error 401: the server must support Basic Authentication abort: LFS HTTP error: HTTP Error 401: the server must support Basic Authentication
(api=http://localhost:$HGPORT1/.git/info/lfs/objects/batch, action=upload) (api=http://localhost:$HGPORT1/.git/info/lfs/objects/batch, action=upload)
[255] [50]
$ hg -R auth_clone --debug push | egrep '^[{}]| ' $ hg -R auth_clone --debug push | egrep '^[{}]| '
{ {
"objects": [ "objects": [
{ {
"actions": { "actions": {
"upload": { "upload": {
"expires_at": "$ISO_8601_DATE_TIME$" "expires_at": "$ISO_8601_DATE_TIME$"

tests/test-lfs-test-server.t

} }
lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) (git-server !) lfs: downloading d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (19 bytes) (git-server !)
Status: 200 (git-server !) Status: 200 (git-server !)
Content-Length: 7 (git-server !) Content-Length: 7 (git-server !)
Content-Type: text/plain; charset=utf-8 (git-server !) Content-Type: text/plain; charset=utf-8 (git-server !)
Date: $HTTP_DATE$ (git-server !) Date: $HTTP_DATE$ (git-server !)
abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (git-server !) abort: corrupt remote lfs object: d11e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 (git-server !)
abort: LFS server error for "c": Validation error (hg-server !) abort: LFS server error for "c": Validation error (hg-server !)
[255] [50]
mharbison72Unsubmitted
Not Done

Any thoughts on why this is exiting with 255 on Windows, but not elsewhere? (It appears to be a py3 only failure)

mharbison72: Any thoughts on why this is exiting with 255 on Windows, but not elsewhere? (It appears to be…
martinvonzAuthorUnsubmitted
Done

Maybe line 37 in this file? Does it happen only in the #git-server case? I barely know anything about LFS, so maybe my guess is completely off (I don't know what that spawn.py scripts is about). I don't have access to a Windows machine, so do you think you can fix it?

martinvonz: Maybe line 37 in this file? Does it happen only in the `#git-server` case? I barely know…
The corrupted blob is not added to the usercache or local store The corrupted blob is not added to the usercache or local store
$ test -f ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 $ test -f ../repo1/.hg/store/lfs/objects/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998
[1] [1]
$ test -f `hg config lfs.usercache`/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998 $ test -f `hg config lfs.usercache`/d1/1e1a642b60813aee592094109b406089b8dff4cb157157f753418ec7857998
[1] [1]
#if git-server #if git-server
} }
"oid": "8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13" "oid": "8e6ea5f6c066b44a0efa43bcce86aea73f17e6e23f0663df0251e7524e140a13"
"size": 6 "size": 6
} }
] ]
"transfer": "basic" (hg-server !) "transfer": "basic" (hg-server !)
} }
abort: LFS server error for "b": The object does not exist abort: LFS server error for "b": The object does not exist
[255] [50]
Check error message when object does not exist: Check error message when object does not exist:
$ cd $TESTTMP $ cd $TESTTMP
$ hg init test && cd test $ hg init test && cd test
$ echo "[extensions]" >> .hg/hgrc $ echo "[extensions]" >> .hg/hgrc
$ echo "lfs=" >> .hg/hgrc $ echo "lfs=" >> .hg/hgrc
$ echo "[lfs]" >> .hg/hgrc $ echo "[lfs]" >> .hg/hgrc
} }
"oid": "bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a" "oid": "bdc26931acfb734b142a8d675f205becf27560dc461f501822de13274fe6fc8a"
"size": 6 "size": 6
} }
] ]
"transfer": "basic" (hg-server !) "transfer": "basic" (hg-server !)
} }
abort: LFS server error for "a": The object does not exist abort: LFS server error for "a": The object does not exist
[255] [50]
$ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS $ "$PYTHON" $RUNTESTDIR/killdaemons.py $DAEMON_PIDS

tests/test-lfs.t

sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
$ test -f $TESTTMP/dummy-remote2/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e $ test -f $TESTTMP/dummy-remote2/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
[1] [1]
Accessing a corrupt file will complain Accessing a corrupt file will complain
$ hg --cwd fromcorrupt2 cat -r 0 large $ hg --cwd fromcorrupt2 cat -r 0 large
abort: integrity check failed on data/large.i:0 abort: integrity check failed on data/large.i:0
[255] [50]
lfs -> normal -> lfs round trip conversions are possible. The 'none()' lfs -> normal -> lfs round trip conversions are possible. The 'none()'
predicate on the command line will override whatever is configured globally and predicate on the command line will override whatever is configured globally and
locally, and ensures everything converts to a regular file. For lfs -> normal, locally, and ensures everything converts to a regular file. For lfs -> normal,
there's no 'lfs' destination repo requirement. For normal -> lfs, there is. there's no 'lfs' destination repo requirement. For normal -> lfs, there is.
$ hg --config extensions.convert= --config 'lfs.track=none()' \ $ hg --config extensions.convert= --config 'lfs.track=none()' \
> convert repo8 convert_normal > convert repo8 convert_normal

tests/test-mq-qrefresh.t

$ hg add a $ hg add a
$ hg qnew a $ hg qnew a
$ hg qrefresh -u 'foo $ hg qrefresh -u 'foo
> bar' > bar'
transaction abort! transaction abort!
rollback completed rollback completed
qrefresh interrupted while patch was popped! (revert --all, qpush to recover) qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: username 'foo\nbar' contains a newline abort: username 'foo\nbar' contains a newline
[255] [50]
$ rm a $ rm a
$ cat .hg/patches/a $ cat .hg/patches/a
# HG changeset patch # HG changeset patch
# Parent 0000000000000000000000000000000000000000 # Parent 0000000000000000000000000000000000000000
diff --git a/a b/a diff --git a/a b/a
new file mode 100644 new file mode 100644
$ hg qpush $ hg qpush
applying a applying a
now at: a now at: a
$ hg qrefresh -u ' ' $ hg qrefresh -u ' '
transaction abort! transaction abort!
rollback completed rollback completed
qrefresh interrupted while patch was popped! (revert --all, qpush to recover) qrefresh interrupted while patch was popped! (revert --all, qpush to recover)
abort: empty username abort: empty username
[255] [50]
$ cat .hg/patches/a $ cat .hg/patches/a
# HG changeset patch # HG changeset patch
# Parent 0000000000000000000000000000000000000000 # Parent 0000000000000000000000000000000000000000
diff --git a/a b/a diff --git a/a b/a
new file mode 100644 new file mode 100644
$ cd .. $ cd ..

tests/test-pull-bundle.t

$ cd repo.pullbundle3 $ cd repo.pullbundle3
$ hg pull -r 1 $ hg pull -r 1
pulling from http://localhost:$HGPORT2/ pulling from http://localhost:$HGPORT2/
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
abort: 00changelog.i@66f7d451a68b: no node abort: 00changelog.i@66f7d451a68b: no node
[255] [50]
$ cd .. $ cd ..
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log
Test processing when nodes used in the pullbundle.manifest end up being hidden Test processing when nodes used in the pullbundle.manifest end up being hidden

tests/test-requires.t

$ hg init t $ hg init t
$ cd t $ cd t
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m test $ hg commit -m test
$ rm .hg/requires $ rm .hg/requires
$ hg tip $ hg tip
abort: unknown version (2) in revlog 00changelog.i abort: unknown version (2) in revlog 00changelog.i
[255] [50]
$ echo indoor-pool > .hg/requires $ echo indoor-pool > .hg/requires
$ hg tip $ hg tip
abort: repository requires features unknown to this Mercurial: indoor-pool abort: repository requires features unknown to this Mercurial: indoor-pool
(see https://mercurial-scm.org/wiki/MissingRequirement for more information) (see https://mercurial-scm.org/wiki/MissingRequirement for more information)
[255] [255]
$ echo outdoor-pool >> .hg/requires $ echo outdoor-pool >> .hg/requires
$ hg tip $ hg tip
abort: repository requires features unknown to this Mercurial: indoor-pool outdoor-pool abort: repository requires features unknown to this Mercurial: indoor-pool outdoor-pool

tests/test-revlog-v2.t

Unknown flags to revlog are rejected Unknown flags to revlog are rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\xff\x00\xde\xad') and None ... fh.write(b'\xff\x00\xde\xad') and None
$ hg log $ hg log
abort: unknown flags (0xff00) in version 57005 revlog 00changelog.i abort: unknown flags (0xff00) in version 57005 revlog 00changelog.i
[255] [50]
$ cd .. $ cd ..
Writing a simple revlog v2 works Writing a simple revlog v2 works
$ hg init simple $ hg init simple
$ cd simple $ cd simple
$ touch foo $ touch foo

tests/test-revlog.t

$ hg init empty-repo $ hg init empty-repo
$ cd empty-repo $ cd empty-repo
Flags on revlog version 0 are rejected Flags on revlog version 0 are rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\x00\x01\x00\x00') and None ... fh.write(b'\x00\x01\x00\x00') and None
$ hg log $ hg log
abort: unknown flags (0x01) in version 0 revlog 00changelog.i abort: unknown flags (0x01) in version 0 revlog 00changelog.i
[255] [50]
Unknown flags on revlog version 1 are rejected Unknown flags on revlog version 1 are rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\x00\x04\x00\x01') and None ... fh.write(b'\x00\x04\x00\x01') and None
$ hg log $ hg log
abort: unknown flags (0x04) in version 1 revlog 00changelog.i abort: unknown flags (0x04) in version 1 revlog 00changelog.i
[255] [50]
Unknown version is rejected Unknown version is rejected
>>> with open('.hg/store/00changelog.i', 'wb') as fh: >>> with open('.hg/store/00changelog.i', 'wb') as fh:
... fh.write(b'\x00\x00\x00\x02') and None ... fh.write(b'\x00\x00\x00\x02') and None
$ hg log $ hg log
abort: unknown version (2) in revlog 00changelog.i abort: unknown version (2) in revlog 00changelog.i
[255] [50]
$ cd .. $ cd ..
Test for CVE-2016-3630 Test for CVE-2016-3630
$ hg init $ hg init
>>> import codecs >>> import codecs

tests/test-username-newline.t

abort: username 'foo\nbar2' contains a newline abort: username 'foo\nbar2' contains a newline
[255] [255]
$ hg ci -Am m -u "`(echo foo; echo bar3)`" $ hg ci -Am m -u "`(echo foo; echo bar3)`"
adding a adding a
transaction abort! transaction abort!
rollback completed rollback completed
abort: username 'foo\nbar3' contains a newline abort: username 'foo\nbar3' contains a newline
[255] [50]