Mercurial > hg
annotate .clang-format @ 48976:877d7e1a4223 stable
amend: fix amend with copies in extras
If copy information is stored only in the commit extras and not in
filelogs, then they get lost on amend if the file wasn't also modified
in the working copy. That's because we create `filectx` object from
the old commit in those cases, and the `.copysource()` of such objects
read only from the filelog. This patch fixes it by always creating a
new `memfilectx` in these cases, passing the calculated copy
information to it.
Differential Revision: https://phab.mercurial-scm.org/D12387
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 18 Mar 2022 21:15:54 -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 |