Mercurial > hg
view tests/test-sparse-clear.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 | 5c2a4f37eace |
children | a6efb9180764 |
line wrap: on
line source
test sparse $ hg init myrepo $ cd myrepo $ cat >> $HGRCPATH <<EOF > [extensions] > sparse= > purge= > strip= > rebase= > EOF $ echo a > index.html $ echo x > data.py $ echo z > readme.txt $ cat > base.sparse <<EOF > [include] > *.sparse > EOF $ hg ci -Aqm 'initial' $ cat > webpage.sparse <<EOF > %include base.sparse > [include] > *.html > EOF $ hg ci -Aqm 'initial' Clear rules when there are includes $ hg debugsparse --include *.py $ ls -A .hg data.py $ hg debugsparse --clear-rules $ ls -A .hg base.sparse data.py index.html readme.txt webpage.sparse Clear rules when there are excludes $ hg debugsparse --exclude *.sparse $ ls -A .hg data.py index.html readme.txt $ hg debugsparse --clear-rules $ ls -A .hg base.sparse data.py index.html readme.txt webpage.sparse Clearing rules should not alter profiles $ hg debugsparse --enable-profile webpage.sparse $ ls -A .hg base.sparse index.html webpage.sparse $ hg debugsparse --include *.py $ ls -A .hg base.sparse data.py index.html webpage.sparse $ hg debugsparse --clear-rules $ ls -A .hg base.sparse index.html webpage.sparse