Mercurial > hg
annotate mercurial/templates/map-cmdline.changelog @ 44912:4234c9af515d stable
flags: read flag from dirstate/disk for workingcopyctx (issue5743)
In 491855ea9d62, various piece of code are moved from committablectx to
workingctx. The reason given is "These read from the dirstate, so they shouldn't
be used in other subclasses."
At least for `flags` this change introduce a bug, because the value flags end up being
read from `_manifest` disregarding the actual state in the working copy (ie: on
disk). When merging exec flag change with renames, this means a new files (the
local content, renamed) is properly written on disk, with the right flags, but
the flags part is later ignored when actually reading flags during merge.
It is not clear to me why the `flags` function was moved, because the code does
not actually hit the dirstate (the reason given in the changeset description).
So I am moving it back to were it comes from and we use a simpler version of
that code (that hit the dirstate everytime) in workingcopyctx. This fix the last
know bug with merging rename and executable byte changes.
Other similar bug might be lurking in 491855ea9d62, but I have not investigated
them.
Differential Revision: https://phab.mercurial-scm.org/D8534
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:38:31 +0200 |
parents | f4aeb952ab77 |
children |
rev | line source |
---|---|
34714
f4aeb952ab77
templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents:
9999
diff
changeset
|
1 [templates] |
2033
e3280d350792
Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2032
diff
changeset
|
2 header = '{date|shortdate} {author|person} <{author|email}>\n\n' |
e3280d350792
Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2032
diff
changeset
|
3 header_verbose = '' |
9936
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
4 changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}{branches}\n\n' |
2033
e3280d350792
Group changes done by the same developer on the same with --style=changelog
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2032
diff
changeset
|
5 changeset_quiet = '\t* {desc|firstline|fill68|tabindent|strip}\n\n' |
9936
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
6 changeset_verbose = '{date|isodate} {author|person} <{author|email}> ({node|short}{tags}{branches})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 start_tags = ' [' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 tag = '{tag}, ' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 last_tag = '{tag}]' |
9936
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
10 start_branches = ' <' |
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
11 branch = '{branch}, ' |
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
12 last_branch = '{branch}>' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 file = '{file}, ' |
2032
cd6bdbc508dd
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1987
diff
changeset
|
14 last_file = '{file}:\n\t' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 file_add = '{file_add}, ' |
2032
cd6bdbc508dd
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1987
diff
changeset
|
16 last_file_add = '{file_add}: new file.\n* ' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 file_del = '{file_del}, ' |
2032
cd6bdbc508dd
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1987
diff
changeset
|
18 last_file_del = '{file_del}: deleted file.\n* ' |