Mercurial > hg
annotate .clang-format @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -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 |