Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
black.toml
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sat, 16 May 2020 20:38:31 +0200
branchstable
changeset 44791 4234c9af515d
parent 44232 5e84a96d865b
permissions -rw-r--r--
flags: read flag from dirstate/disk for workingcopyctx (issue5743) In 491855ea9d62, various piece of code are moved from committablectx to workingctx. The reason given is "These read from the dirstate, so they shouldn't be used in other subclasses." At least for `flags` this change introduce a bug, because the value flags end up being read from `_manifest` disregarding the actual state in the working copy (ie: on disk). When merging exec flag change with renames, this means a new files (the local content, renamed) is properly written on disk, with the right flags, but the flags part is later ignored when actually reading flags during merge. It is not clear to me why the `flags` function was moved, because the code does not actually hit the dirstate (the reason given in the changeset description). So I am moving it back to were it comes from and we use a simpler version of that code (that hit the dirstate everytime) in workingcopyctx. This fix the last know bug with merging rename and executable byte changes. Other similar bug might be lurking in 491855ea9d62, but I have not investigated them. Differential Revision: https://phab.mercurial-scm.org/D8534
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
hg-stable