Mercurial > hg
view tests/test-ssh-repoerror.t @ 45375:8c466bcb0879
revert: remove dangerous `parents` argument from `cmdutil.revert()`
As we found out the hard way (thanks to spectral@ for figuring it
out!), `cmdutil.revert()`'s `parents` argument must be
`repo.dirstate.parents()` or things may go wrong. We had an extension
that passed in the target commit as the first parent. The `hg split`
command from the evolve extension seems to have made the same mistake,
but I haven't looked carefully.
The problem is that `cmdutil._performrevert()` calls
`dirstate.normal()` on reverted files if the commit to revert to
equals the first parent. So if you pass in `ctx=foo` and
`parents=(foo.node(), nullid)`, then `dirstate.normal()` will be
called for the revert files, even though they might not be clean in
the working copy.
There doesn't seem to be any reason, other than a tiny performance
benefit, to passing the `parents` around instead of looking them up
again in `cmdutil._performrevert()`, so that's what this patch does.
Differential Revision: https://phab.mercurial-scm.org/D8925
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 10 Aug 2020 21:46:47 -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]