Mercurial > hg-stable

annotate pyproject.toml @ 46794:1099ca176ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 10 Mar 2021 13:08:41 +0530
parents d4c8b4b90ecb
children 5be886200eb6 58fe6d127a01
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
46453
45afff0f530a pyproject: add config file
Augie Fackler <augie@google.com>
parents:
diff changeset
1 [build-system]
45afff0f530a pyproject: add config file
Augie Fackler <augie@google.com>
parents:
diff changeset
2 requires = ["setuptools", "wheel"]
45afff0f530a pyproject: add config file
Augie Fackler <augie@google.com>
parents:
diff changeset
3 build-backend = "setuptools.build_meta"
46454
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
4
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
5 [tool.black]
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
6 line-length = 80
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
7 exclude = '''
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
8 build/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
9 | wheelhouse/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
10 | dist/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
11 | packages/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
12 | \.hg/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
13 | \.mypy_cache/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
14 | \.venv/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
15 | mercurial/thirdparty/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
16 '''
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
17 skip-string-normalization = true
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46453
diff changeset
18 quiet = true