Mercurial > hg
annotate .editorconfig @ 47052:f8fa7ec53517 stable
git: initialize `extra` to have at least the branch name for nullid
Otherwise, this crashes trying to convert to local encoding:
...
File "/mnt/c/Users/Matt/hg/mercurial/logcmdutil.py", line 333, in _show
branch = ctx.branch()
File "/mnt/c/Users/Matt/hg/mercurial/context.py", line 675, in branch
return encoding.tolocal(self._changeset.extra.get(b"branch"))
File "/mnt/c/Users/Matt/hg/mercurial/encoding.py", line 181, in tolocal
if isasciistr(s):
TypeError: a bytes-like object is required, not 'NoneType'
This was originally reported to the thg bug tracker.
https://foss.heptapod.net/mercurial/tortoisehg/thg/-/issues/5629
Differential Revision: https://phab.mercurial-scm.org/D10528
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 27 Apr 2021 19:38:19 -0400 |
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 |