pyproject.toml
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 27 Aug 2021 13:51:44 -0700
branchstable
changeset 47886 86a60679cf61
parent 46382 d4c8b4b90ecb
child 46455 5be886200eb6
child 48004 58fe6d127a01
permissions -rw-r--r--
fix: again allow formatting the working copy while merging I forgot about unfinished merges (I think I was thinking only about unfinished merge conflicts) when I wrote https://phab.mercurial-scm.org/D11209. As a coworker (hg contributor dploch) reported to me, this led to `hg fix --working-dir` failing when you have an uncommitted merge. The fix is trivial: just move the assertion to just before the call to `scmutil.movedirstate()` where it actually matters. Differential Revision: https://phab.mercurial-scm.org/D11376
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
46381
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"
46382
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
     4
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
     5
[tool.black]
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
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: 46381
diff changeset
     7
exclude = '''
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
     8
build/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
     9
| wheelhouse/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
    10
| dist/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
    11
| packages/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
    12
| \.hg/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
    13
| \.mypy_cache/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
    14
| \.venv/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
    15
| mercurial/thirdparty/
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
diff changeset
    16
'''
d4c8b4b90ecb black: merge config into main pyproject.toml now that we have it
Augie Fackler <augie@google.com>
parents: 46381
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: 46381
diff changeset
    18
quiet = true