Mercurial > hg
view tests/test-pull-permission.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 | f1186c292d03 |
children | 2f2682f40ea0 |
line wrap: on
line source
#require unix-permissions no-root $ hg init a $ cd a $ echo foo > b $ hg add b $ hg ci -m "b" $ chmod -w .hg/store $ cd .. $ hg clone a b requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets 97310831fa1a updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ chmod +w a/.hg/store # let test clean up $ cd b $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files checked 1 changesets with 1 changes to 1 files $ cd ..