annotate templates/map-cmdline.changelog @ 3325:50a18815e3f0

Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Tue, 10 Oct 2006 21:03:24 +0300
parents e3280d350792
children 3aa420c56ac4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 = ''
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 changeset = '\t* {files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\t[{node|short}]{tags}\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
4 changeset_quiet = '\t* {desc|firstline|fill68|tabindent|strip}\n\n'
1987
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
5 changeset_verbose = '{date|isodate} {author|person} <{author|email}> ({node|short}{tags})\n\n\t* {file_adds|stringify|fill68|tabindent}{file_dels|stringify|fill68|tabindent}{files|stringify|fill68|tabindent}{desc|fill68|tabindent|strip}\n\n'
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}]'
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
9 file = '{file}, '
2032
cd6bdbc508dd Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1987
diff changeset
10 last_file = '{file}:\n\t'
1987
04c17fc39c84 add changelog style to command line template.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
11 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
12 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
13 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
14 last_file_del = '{file_del}: deleted file.\n* '