Mercurial > hg
view tests/test-revisions.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 | d916ed3ca951 |
children | 95c4cca641f6 |
line wrap: on
line source
$ hg init repo $ cd repo $ echo 0 > a $ hg ci -qAm 0 $ for i in 5 8 14 43 167; do > hg up -q 0 > echo $i > a > hg ci -qm $i > done $ cat <<EOF >> .hg/hgrc > [alias] > l = log -T '{rev}:{shortest(node,1)}\n' > EOF $ hg l 5:00f 4:7ba5d 3:7ba57 2:72 1:9 0:b $ cat <<EOF >> .hg/hgrc > [experimental] > revisions.disambiguatewithin=not 4 > EOF $ hg l 5:00 4:7ba5d 3:7b 2:72 1:9 0:b 9 was unambiguous and still is $ hg l -r 9 1:9 7 was ambiguous and still is $ hg l -r 7 abort: 00changelog.i@7: ambiguous identifier! [255] 7b is no longer ambiguous $ hg l -r 7b 3:7b $ cd ..