Mercurial > hg
annotate .clang-format @ 42338:78530404d00b
convert: demonstrate broken {files} list in merge commits with file flags
When there is a merge in which the flags for a file from p2 is
non-empty, `hg convert` will incorrectly include that in the
changeset's files list.
Differential Revision: https://phab.mercurial-scm.org/D6408
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 17 May 2019 11:32:48 -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 |