Mercurial > hg
annotate pyproject.toml @ 48759:d169e651066b
mergestate: use an early return for trivial merges
`filemerge.filemerge()` returns `None` if no merge was needed because
the two sides were identical. I'd like to move that to the
caller. This is a little refactoring to prepare for that.
Differential Revision: https://phab.mercurial-scm.org/D12153
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 07 Feb 2022 20:12:09 -0800 |
parents | 58fe6d127a01 |
children | d4b275587847 |
rev | line source |
---|---|
46381 | 1 [build-system] |
2 requires = ["setuptools", "wheel"] | |
46382
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
3 |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
4 [tool.black] |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
5 line-length = 80 |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
6 exclude = ''' |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
7 build/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
8 | wheelhouse/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
9 | dist/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
10 | packages/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
11 | \.hg/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
12 | \.mypy_cache/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
13 | \.venv/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
14 | mercurial/thirdparty/ |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
15 ''' |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
16 skip-string-normalization = true |
d4c8b4b90ecb
black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents:
46381
diff
changeset
|
17 quiet = true |