Mercurial > hg
annotate .editorconfig @ 45670:a8fb29b05f92
salvaged: properly deal with salvaged file during copy tracing
When salvaged files are encountered, the removal have been reverted and we
should keep the rename information from the other side.
The conditional was starting to be quite hairy, so we spell it out in multiple
elif case for readability.
This fixes the associated test cases introduced a while back. The changeset centric copy tracing is now (known) bug free.
Differential Revision: https://phab.mercurial-scm.org/D9130
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 16 Sep 2020 21:00:02 +0200 |
parents | c25efc468a49 |
children |
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 | |
45392
c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
Matt Harbison <matt_harbison@yahoo.com>
parents:
38281
diff
changeset
|
9 end_of_line = lf |
28793 | 10 |
11 [*.{c,h}] | |
12 indent_size = 8 | |
13 indent_style = tab | |
14 trim_trailing_whitespace = true | |
45392
c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
Matt Harbison <matt_harbison@yahoo.com>
parents:
38281
diff
changeset
|
15 end_of_line = lf |
38281
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
16 |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
17 [*.t] |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
18 indent_size = 2 |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
19 indent_style = space |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
20 trim_trailing_whitespace = false |
45392
c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
Matt Harbison <matt_harbison@yahoo.com>
parents:
38281
diff
changeset
|
21 end_of_line = lf |