annotate pyproject.toml @ 48716:f1eb77dceb36

narrow: allow merging non-conflicting change outside of the narrow spec We use the mergestate to carry information about these merge action and reprocess them at commit time to apply the necessary update. The dirstate itself is never affected and remains "pure", with content only in the narrow-spec. This file involved in such merge are therefor not listed in `hg status`. The current testing is based on a modification of the previous testing, that refused to do such merges. As a result it is a bit simple and more extensive code and testing testing will have to be introduced later. I am planning to do this extra testing, soon. In addition, this only works for flat manifest. Support for tree manifest will need more work. I am not currently planning to do this work. Differential Revision: https://phab.mercurial-scm.org/D12119
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 03 Feb 2022 18:14:11 +0100
parents 58fe6d127a01
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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"]
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