Mercurial > hg
annotate black.toml @ 45587:768412472663
merge: store cases when a file is absent post merge in commitinfo
Some merges can result in file being absent form working directory. This can be
one of file was kept deleted or file was removed by merge code.
User might revert the file back before committing. In such cases we will like to
have better handling and create new filenodes.
We store this info in mergestate as commitinfo so that we can use it while
committing to create new filenode if required.
Differential Revision: https://phab.mercurial-scm.org/D9003
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 24 Aug 2020 15:35:34 +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 |