Mercurial > hg
annotate black.toml @ 46100:a771ffc378a8
simplemerge: write output only once it's complete
`simplemerge()` can write either to `ui.fout` or to the file context
(for in-memory merge). This patch simplifies the code a bit by making
it build the output the same way regardless of where it's written, and
then writes the whole output at once. I don't think it will be a
problem that we don't output anything until the whole file is merged
even if the file is large.
Differential Revision: https://phab.mercurial-scm.org/D9550
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 09 Dec 2020 00:00:19 -0800 |
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 |