Mercurial > hg
annotate mercurial/templates/map-cmdline.changelog @ 19987:ba6486076429 stable
merge: move forgets to the beginning of the action list
Forgets need to be in the beginning of the action list, same as removes. This
lets us avoid clashes in the dirstate where a directory is forgotten and a
file with the same name is added, or vice versa.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 06 Nov 2013 10:20:18 -0800 |
parents | f91e5630ce7e |
children | f4aeb952ab77 |
rev | line source |
---|---|
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
|
1 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
|
2 header_verbose = '' |
9936
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
3 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
|
4 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
|
5 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
|
6 start_tags = ' [' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 tag = '{tag}, ' |
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 last_tag = '{tag}]' |
9936
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
9 start_branches = ' <' |
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
10 branch = '{branch}, ' |
3aa420c56ac4
list branches in changelog template
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
2033
diff
changeset
|
11 last_branch = '{branch}>' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 file = '{file}, ' |
2032
cd6bdbc508dd
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1987
diff
changeset
|
13 last_file = '{file}:\n\t' |
1987
04c17fc39c84
add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 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
|
15 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
|
16 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
|
17 last_file_del = '{file_del}: deleted file.\n* ' |