Mercurial > hg
annotate black.toml @ 45459:ccd3bf4490c1
merge: show list of bids for each file in bid-merge in ui.debug()
Earlier, we were showing the list of bids only when we were ambiguously picking.
However, the cases where we unambiguously picked a side may not always be
correct and need to be fixed.
Having list of bids for all files will be helpful in debugging.
Differential Revision: https://phab.mercurial-scm.org/D8966
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 26 Aug 2020 17:20:53 +0530 |
parents | 5e84a96d865b |
children |
rev | line source |
---|---|
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 |