Mercurial > hg
annotate black.toml @ 46580:2076df13d00f
copies-rust: refactor the "deletion" case
We rearrange the code to single out the case where information need to be
overwritten on both side of the merge. This open the way to better dealing with
this case.
Differential Revision: https://phab.mercurial-scm.org/D9651
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Dec 2020 10:59:00 +0100 |
parents | 5be886200eb6 |
children |
rev | line source |
---|---|
46455
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 [tool.black] |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 line-length = 80 |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 exclude = ''' |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 build/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 | wheelhouse/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 | dist/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 | packages/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 | \.hg/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 | \.mypy_cache/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 | \.venv/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 | mercurial/thirdparty/ |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 ''' |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 skip-string-normalization = true |
5be886200eb6
ci-fix: backed out changeset d4c8b4b90ecb
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 quiet = true |