Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/raw/map @ 5483:0c43f87baba3 default tip
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 | de081fbb27fe |
children |
rev | line source |
---|---|
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
1 header = header.tmpl |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
2 footer = '' |
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
3 changeset = changeset.tmpl |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
4 difflineplus = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
5 difflineminus = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
6 difflineat = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
7 diffline = '#line#' |
2520
e30f425a4b2c
make changeset outputted by the raw template to be closer to 'hg export'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2094
diff
changeset
|
8 changesetparent = '# Parent #node#' |
e30f425a4b2c
make changeset outputted by the raw template to be closer to 'hg export'
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2094
diff
changeset
|
9 changesetchild = '# Child #node#' |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
10 filenodelink = '' |
2534
d5a3cc6520d5
Fix raw files in the web UI.
Eric Hopper <hopper@omnifarious.org>
parents:
2094
diff
changeset
|
11 filerevision = '#rawfileheader##raw#' |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
12 fileline = '#line#' |
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
13 diffblock = '#lines#' |
3276
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
14 filediff = filediff.tmpl |
105253b30239
Moved hgweb map-* files into their style directories and adjusted them.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3228
diff
changeset
|
15 fileannotate = fileannotate.tmpl |
1901
c64bef3d7043
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1694
diff
changeset
|
16 annotateline = '#author#@#rev#: #line#' |
3935
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
3276
diff
changeset
|
17 manifest = manifest.tmpl |
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
3276
diff
changeset
|
18 manifestdirentry = 'drwxr-xr-x {basename}\n' |
472d9670e6e9
hgweb: add raw manifest template
Brendan Cully <brendan@kublai.com>
parents:
3276
diff
changeset
|
19 manifestfileentry = '{permissions|permissions} {size} {basename}\n' |
4024
de081fbb27fe
hgweb: add raw template to hgwebdir
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3935
diff
changeset
|
20 index = index.tmpl |
de081fbb27fe
hgweb: add raw template to hgwebdir
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3935
diff
changeset
|
21 indexentry = '#url#\n' |