Mercurial > hg
annotate .editorconfig @ 43934:71fee4564410
rebase: use rewriteutil.precheck() instead of reimplementing it
After this patch, there's still another place in `rebase.py`, in the
`--stop` code path, that reimplements `rewriteutil.precheck()`. I
couldn't fix that place because it `rewriteutil.precheck()` checks
that there is only one dirstate parent, which fails because we have
two parents at that point. I think it's incorrect that rebase leaves
the user with two parents during conflicts, but changing that is way
out of scope for this series.
Differential Revision: https://phab.mercurial-scm.org/D7685
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 18 Dec 2019 09:18:02 +0300 |
parents | 1d6066336d7b |
children | c25efc468a49 |
rev | line source |
---|---|
28793 | 1 # See http://EditorConfig.org for the specification |
2 | |
3 root = true | |
4 | |
5 [*.py] | |
6 indent_size = 4 | |
7 indent_style = space | |
8 trim_trailing_whitespace = true | |
9 | |
10 [*.{c,h}] | |
11 indent_size = 8 | |
12 indent_style = tab | |
13 trim_trailing_whitespace = true | |
38281
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
14 |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
15 [*.t] |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
16 indent_size = 2 |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
17 indent_style = space |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
18 trim_trailing_whitespace = false |