Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/map @ 174:23057dc57d1b
hg merge: abort if there are outstanding changes in the working directory
We currently don't support merging from the tip into the working
directory, so merge with outstanding local changes is asking for
trouble.
author | mpm@selenic.com |
---|---|
date | Thu, 26 May 2005 22:54:48 -0800 |
parents | 8da1df932c16 |
children | f918a6fa2572 |
rev | line source |
---|---|
142 | 1 header = header.tmpl |
2 footer = footer.tmpl | |
138 | 3 changelog = changelog.tmpl |
173
8da1df932c16
hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents:
172
diff
changeset
|
4 naventry = "<a href="?cmd=changelog;rev=#rev#">#label#</a> " |
138 | 5 filedifflink = "<a href="?cmd=filediff;node=#node#;file=#file#">#file#</a> " |
6 filenodelink = "<a href="?cmd=file;filenode=#filenode#;file=#file#">#file#</a> " | |
7 fileellipses = "..." | |
8 changelogentry = changelogentry.tmpl | |
9 changeset = changeset.tmpl | |
10 manifest = manifest.tmpl | |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
143
diff
changeset
|
11 manifestdirentry = "<div class="parity#parity#"><a href="?cmd=manifest;manifest=#manifest#;path=#path#">#basename#/</a><br /></div>" |
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
143
diff
changeset
|
12 manifestfileentry = "<div class="parity#parity#"><a href="?cmd=file;filenode=#filenode#;file=#file#">#basename#</a><br /></div>" |
138 | 13 filerevision = filerevision.tmpl |
14 fileannotate = fileannotate.tmpl | |
15 filediff = filediff.tmpl | |
16 filelog = filelog.tmpl | |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
143
diff
changeset
|
17 fileline = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line#</div>" |
138 | 18 filelogentry = filelogentry.tmpl |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
143
diff
changeset
|
19 annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author#@#rev#</a></td><td><pre>#line#</pre></td></tr>" |
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
143
diff
changeset
|
20 difflineplus = "<span class="plusline">#line#</span>" |
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
143
diff
changeset
|
21 difflineminus = "<span class="minusline">#line#</span>" |
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
143
diff
changeset
|
22 difflineat = "<span class="atline">#line#</span>" |
142 | 23 diffline = "#line#" |
167 | 24 changelogparent = "<tr><td align="right">parent: </td><td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>" |
25 changesetparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=changeset;node=#node#">#node#</a></td></tr>" | |
26 filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node#</a></td></tr>" | |
27 fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node#</a></td></tr>" | |
168 | 28 tags = tags.tmpl |
29 tagentry = "<div class="parity#parity#"><tt>#node#</tt> <a href="?cmd=changeset;node=#node#">#tag#</a><br /></div>" | |
172
e9b1147db448
hgweb: alternating colors for multifile diffs
mpm@selenic.com
parents:
168
diff
changeset
|
30 diffblock = "<div class="parity#parity#">#lines#</div>" |