Mercurial > hg
annotate .clang-format @ 42290:e79aeb518aa1
overlayworkingctx: don't include added-then-deleted files in memctx
If a file (such as a .orig file) is temporarily added to the
overlayworkingctx and then deleted, it's still going to be in the
_cache dict. In tomemctx(), we created the list of files from
_cache.keys(), so the memctx.files() would include the temporary
file. That was fine because the list of files was only used in
localrepo.commitctx() (I think), where there's an extra filtering of
incorrectly removed files (annotated with an inaccurate "update
manifest" comment). I'd like to call memctx.files() in another case,
but first we need to make it accurate.
Differential Revision: https://phab.mercurial-scm.org/D6361
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 10 May 2019 14:27:22 -0700 |
parents | d0a3fa849cb8 |
children |
rev | line source |
---|---|
34798
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
1 BasedOnStyle: LLVM |
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
2 IndentWidth: 8 |
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
3 UseTab: ForIndentation |
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
4 BreakBeforeBraces: Linux |
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
5 AllowShortIfStatementsOnASingleLine: false |
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
6 IndentCaseLabels: false |
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
7 AllowShortBlocksOnASingleLine: false |
e33381d95930
clang-format: configuration for the clang-format source formatter
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
8 AllowShortFunctionsOnASingleLine: false |
36224
d0a3fa849cb8
formatting: enforce system headers before local headers
Augie Fackler <augie@google.com>
parents:
34798
diff
changeset
|
9 IncludeCategories: |
d0a3fa849cb8
formatting: enforce system headers before local headers
Augie Fackler <augie@google.com>
parents:
34798
diff
changeset
|
10 - Regex: '^<' |
d0a3fa849cb8
formatting: enforce system headers before local headers
Augie Fackler <augie@google.com>
parents:
34798
diff
changeset
|
11 Priority: 1 |
d0a3fa849cb8
formatting: enforce system headers before local headers
Augie Fackler <augie@google.com>
parents:
34798
diff
changeset
|
12 - Regex: '^"' |
d0a3fa849cb8
formatting: enforce system headers before local headers
Augie Fackler <augie@google.com>
parents:
34798
diff
changeset
|
13 Priority: 2 |