Mercurial > hg > mercurial-crew-with-dirclash

annotate templates/map-cmdline.default @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 051fb8c2567c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4351
051fb8c2567c command line templates: add formatnode filter
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3457
diff changeset
1 changeset = 'changeset: {rev}:{node|short}\n{branches}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n'
1919
8f565af14095 add changeset_quiet to templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1915
diff changeset
2 changeset_quiet = '{rev}:{node|short}\n'
3456
451ec905625b Add new branch info to templater and use it in map-cmdline.default.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3454
diff changeset
3 changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}description:\n{desc|strip}\n\n\n'
3457
fab28100ea88 Added extra changeset info to templater and map-cmdline.default.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3456
diff changeset
4 changeset_debug = 'changeset: {rev}:{node}\n{branches}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{files}{file_adds}{file_dels}{file_copies}{extras}description:\n{desc|strip}\n\n\n'
3454
0600d326d96a Adjust default cmdline style to really match verbose/debug log.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3190
diff changeset
5 start_files = 'files: '
0600d326d96a Adjust default cmdline style to really match verbose/debug log.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3190
diff changeset
6 file = ' {file}'
0600d326d96a Adjust default cmdline style to really match verbose/debug log.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3190
diff changeset
7 end_files = '\n'
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
8 start_file_adds = 'files+: '
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
9 file_add = ' {file_add}'
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
10 end_file_adds = '\n'
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
11 start_file_dels = 'files-: '
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
12 file_del = ' {file_del}'
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
13 end_file_dels = '\n'
3190
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 1919
diff changeset
14 start_file_copies = 'copies: '
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 1919
diff changeset
15 file_copy = ' {name} ({source})'
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 1919
diff changeset
16 end_file_copies = '\n'
4351
051fb8c2567c command line templates: add formatnode filter
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3457
diff changeset
17 parent = 'parent: {rev}:{node|formatnode}\n'
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
18 manifest = 'manifest: {rev}:{node}\n'
3456
451ec905625b Add new branch info to templater and use it in map-cmdline.default.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3454
diff changeset
19 branch = 'branch: {branch}\n'
1907
7718885070b1 let commands that show changesets use templates.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
20 tag = 'tag: {tag}\n'
3457
fab28100ea88 Added extra changeset info to templater and map-cmdline.default.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3456
diff changeset
21 extra = 'extra: {key}={value|stringescape}\n'