black.toml
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 24 Aug 2020 15:20:09 +0530
changeset 45479 09edbff6ae8d
parent 44232 5e84a96d865b
permissions -rw-r--r--
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally If a file is not present on the local side, and it's unchanged between other merge parent and ancestor, we don't use any action, neither we had a if-else branch for that condition. This leads to bid-merge missing that there is a such action possible which can be performed. As test changes demonstrate, we now choose the locally deleted side instead of choosing the remote one consistently. This is also wrong behavior which is resulted because of missing possible action. It will be fixed in next patch. This whole logic is not acurrate as we should prompt user on what to do when this kind of criss-cross merge is in play. Differential Revision: https://phab.mercurial-scm.org/D8940
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
43064
929678eb4cbd black: add a pyproject.toml that contains our black settings
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
[tool.black]
929678eb4cbd black: add a pyproject.toml that contains our black settings
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
line-length = 80
43224
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
     3
exclude = '''
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
     4
build/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
     5
| wheelhouse/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
     6
| dist/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
     7
| packages/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
     8
| \.hg/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
     9
| \.mypy_cache/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
    10
| \.venv/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
    11
| mercurial/thirdparty/
2a201b366d5b black: use multiline exclude definition
Augie Fackler <augie@google.com>
parents: 43223
diff changeset
    12
'''
43223
15c05732d177 black: move remaining config knobs into toml file
Augie Fackler <augie@google.com>
parents: 43222
diff changeset
    13
skip-string-normalization = true
15c05732d177 black: move remaining config knobs into toml file
Augie Fackler <augie@google.com>
parents: 43222
diff changeset
    14
quiet = true