Mercurial > hg
view tests/test-ssh-repoerror.t @ 45545:e5e1285b6f6f
largefiles: prevent in-memory merge instead of switching to on-disk
I enabled in-memory merge by default while testing some changes. I
spent quite some time troubleshooting why largefiles was still
creating an on-disk mergestate. Then I found out that it ignores the
callers `wc` argument to `mergemod._update()` and always uses on-disk
merge. This patch changes that so we raise an error if largefiles is
used with in-memory merge. That way we'll notice if in-memory merge is
used with largefiles instead of silently replacing ignoring the
`overlayworkingctx` instance and updating the working copy instead.
I felt a little bad that this would break things more for users with
both largefiles and in-memory rebase enabled. So I also added a
higher-level override to make sure that largefiles disables in-memory
rebase. It turns out that that fixes `run-tests.py -k largefiles
--extra-config-opt rebase.experimental.inmemory=1`.
Differential Revision: https://phab.mercurial-scm.org/D9069
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 22 Sep 2020 23:18:37 -0700 |
parents | b6673e9bdcf6 |
children | 95c4cca641f6 |
line wrap: on
line source
#require unix-permissions no-root initial setup $ cat << EOF >> $HGRCPATH > [ui] > ssh="$PYTHON" "$TESTDIR/dummyssh" > EOF repository itself is non-readable --------------------------------- $ hg init no-read $ hg id ssh://user@dummy/no-read 000000000000 $ chmod a-rx no-read $ hg id ssh://user@dummy/no-read remote: abort: Permission denied: *$TESTTMP/no-read/.hg* (glob) abort: no suitable response from remote hg! [255] special case files are visible, but unreadable ---------------------------------------------- This is "similar" to the test above, but the directory is "traversable". This seems an unexpected case in real life, but we test it anyway. $ hg init other $ hg id ssh://user@dummy/other 000000000000 $ for item in `find other | sort -r` ; do > chmod a-r $item > done $ hg id ssh://user@dummy/other remote: abort: Permission denied: '$TESTTMP/other/.hg/requires' abort: no suitable response from remote hg! [255] directory toward the repository is read only -------------------------------------------- $ mkdir deep $ hg init deep/nested $ hg id ssh://user@dummy/deep/nested 000000000000 $ chmod a-rx deep $ hg id ssh://user@dummy/deep/nested remote: abort: Permission denied: *$TESTTMP/deep/nested/.hg* (glob) abort: no suitable response from remote hg! [255] repository has wrong requirement -------------------------------- $ hg init repo-future $ hg id ssh://user@dummy/repo-future 000000000000 $ echo flying-car >> repo-future/.hg/requires $ hg id ssh://user@dummy/repo-future remote: abort: repository requires features unknown to this Mercurial: flying-car! remote: (see https://mercurial-scm.org/wiki/MissingRequirement for more information) abort: no suitable response from remote hg! [255]