Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates/map
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 981 4f81068ed8cd
child 1077 b87aeccf73d9
permissions -rw-r--r--
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
858
c333dfa8fa1a [PATCH] Move default page name into map file
Jeff Sipek <jeffpc@optonline.net>
parents: 740
diff changeset 
     1
 
default = "changelog"
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset 
     2
 
header = header.tmpl
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset 
     3
 
footer = footer.tmpl
538
7140bc781655 Add multiple keyword search to hgweb
mpm@selenic.com
parents: 380
diff changeset 
     4
 
search = search.tmpl
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     5
 
changelog = changelog.tmpl
173
8da1df932c16 hgweb: make navigation of changesets a bit nicer
mpm@selenic.com
parents: 172
diff changeset 
     6
 
naventry = "<a href="?cmd=changelog;rev=#rev#">#label#</a> "
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     7
 
filedifflink = "<a href="?cmd=filediff;node=#node#;file=#file#">#file#</a> "
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     8
 
filenodelink = "<a href="?cmd=file;filenode=#filenode#;file=#file#">#file#</a> "
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     9
 
fileellipses = "..."
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    10
 
changelogentry = changelogentry.tmpl
708
e849b4db6c95 Use changelogentry.tmpl for search results, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 672
diff changeset 
    11
 
searchentry = changelogentry.tmpl
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    12
 
changeset = changeset.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    13
 
manifest = manifest.tmpl
359
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 241
diff changeset 
    14
 
manifestdirentry = "<tr class="parity#parity#"><td><tt>drwxr-xr-x</tt>&nbsp;<td><a href="?cmd=manifest;manifest=#manifest#;path=#path#">#basename#/</a>"
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 241
diff changeset 
    15
 
manifestfileentry = "<tr class="parity#parity#"><td><tt>#permissions|permissions#</tt>&nbsp;<td><a href="?cmd=file;filenode=#filenode#;file=#file#">#basename#</a>"
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    16
 
filerevision = filerevision.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    17
 
fileannotate = fileannotate.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    18
 
filediff = filediff.tmpl
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    19
 
filelog = filelog.tmpl
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 173
diff changeset 
    20
 
fileline = "<div class="parity#parity#"><span class="lineno">#linenumber# </span>#line|escape#</div>"
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    21
 
filelogentry = filelogentry.tmpl
235
eb341488aa4c Obfuscate author in all HTML templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 201
diff changeset 
    22
 
annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author|obfuscate#@#rev#</a></td><td><pre>#line|escape#</pre></td></tr>"
672
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset 
    23
 
difflineplus = "<span class="plusline">#line|escape#</span>"
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset 
    24
 
difflineminus = "<span class="minusline">#line|escape#</span>"
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset 
    25
 
difflineat = "<span class="atline">#line|escape#</span>"
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset 
    26
 
diffline = "#line|escape#"
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    27
 
changelogparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    28
 
changesetparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
375
b29219389b00 Show nice short hashes in hgweb
mpm@selenic.com
parents: 359
diff changeset 
    29
 
filerevparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
b29219389b00 Show nice short hashes in hgweb
mpm@selenic.com
parents: 359
diff changeset 
    30
 
fileannotateparent = "<tr><td class="metatag">parent:</td><td><a href="?cmd=annotate;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
168
65cf1b0cfe86 hgweb: add tags links and manifest links
mpm@selenic.com
parents: 167
diff changeset 
    31
 
tags = tags.tmpl
586
11578820b5d7 [PATCH] Tags template cleanup
mpm@selenic.com
parents: 585
diff changeset 
    32
 
tagentry = "<li class="tagEntry parity#parity#"><span class="node">#node#</span> <a href="?cmd=changeset;node=#node#">#tag#</a></li>"
672
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset 
    33
 
diffblock = "<pre class="parity#parity#">#lines#</pre>"
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    34
 
changelogtag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    35
 
changesettag = "<tr><th class="tag">tag:</th><td class="tag">#tag#</td></tr>"
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 598
diff changeset 
    36
 
filediffparent = "<tr><th class="parent">parent #rev#:</th><td class="parent"><a href="?cmd=changeset;node=#node#">#node|short#</a></td></tr>"
598
f8d44a2e6928 [PATCH 4/5]: cleaning the template parent management in hgweb
mpm@selenic.com
parents: 586
diff changeset 
    37
 
filelogparent = "<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="?cmd=file;file=#file#;filenode=#node#">#node|short#</a></td></tr>"
941
4cf418c2a013 Add a multi-repository server
mpm@selenic.com
parents: 896
diff changeset 
    38
 
indexentry = "<tr class="parity#parity#"><td><a  href="#url#">#name#</a></td><td>#shortdesc#</td><td>#author# <i>#email|obfuscate#</i></td><td>#lastupdate|age# ago</td></tr>"
4cf418c2a013 Add a multi-repository server
mpm@selenic.com
parents: 896
diff changeset 
    39
 
index = index.tmpl
mercurial-crew-with-dirclash