Mercurial > hg
annotate black.toml @ 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 | 5e84a96d865b |
children |
rev | line source |
---|---|
43064
929678eb4cbd
black: add a pyproject.toml that contains our black settings
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
1 [tool.black] |
929678eb4cbd
black: add a pyproject.toml that contains our black settings
Augie Fackler <augie@google.com>
parents:
diff
changeset
|
2 line-length = 80 |
43224
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
3 exclude = ''' |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
4 build/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
5 | wheelhouse/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
6 | dist/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
7 | packages/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
8 | \.hg/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
9 | \.mypy_cache/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
10 | \.venv/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
11 | mercurial/thirdparty/ |
2a201b366d5b
black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents:
43223
diff
changeset
|
12 ''' |
43223
15c05732d177
black: move remaining config knobs into toml file
Augie Fackler <augie@google.com>
parents:
43222
diff
changeset
|
13 skip-string-normalization = true |
15c05732d177
black: move remaining config knobs into toml file
Augie Fackler <augie@google.com>
parents:
43222
diff
changeset
|
14 quiet = true |