templates/shortlog.tmpl
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 3363 ce8f31e0b3b8
child 5266 46c5e1ee8aaa
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2686
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
     1
#header#
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
     2
<title>#repo|escape#: shortlog</title>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
     3
<link rel="alternate" type="application/rss+xml"
3264
d1aa83f199ef Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents: 3205
diff changeset
     4
   href="#url#rss-log" title="RSS feed for #repo|escape#">
2686
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
     5
</head>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
     6
<body>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
     7
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
     8
<div class="buttons">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3362
diff changeset
     9
<a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3362
diff changeset
    10
<a href="#url#tags{sessionvars%urlparameter}">tags</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3362
diff changeset
    11
<a href="#url#file/#node|short#/{sessionvars%urlparameter}">manifest</a>
2686
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    12
#archives%archiveentry#
3264
d1aa83f199ef Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents: 3205
diff changeset
    13
<a type="application/rss+xml" href="#url#rss-log">rss</a>
2686
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    14
</div>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    15
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    16
<h2>shortlog for #repo|escape#</h2>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    17
3264
d1aa83f199ef Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents: 3205
diff changeset
    18
<form action="#url#log">
3362
887da2247b57 hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
    19
{sessionvars%hiddenformentry}
2686
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    20
<p>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    21
<label for="search1">search:</label>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    22
<input name="rev" id="search1" type="text" size="30">
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    23
navigate: <small class="navigate">#changenav%navshortentry#</small>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    24
</p>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    25
</form>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    26
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    27
#entries%shortlogentry#
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    28
3264
d1aa83f199ef Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents: 3205
diff changeset
    29
<form action="#url#log">
3362
887da2247b57 hgweb: Keep session variables (currently only style) in HTML forms, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
    30
{sessionvars%hiddenformentry}
2686
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    31
<p>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    32
<label for="search2">search:</label>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    33
<input name="rev" id="search2" type="text" size="30">
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    34
navigate: <small class="navigate">#changenav%navshortentry#</small>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    35
</p>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    36
</form>
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    37
d98eebc48d5e [hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
diff changeset
    38
#footer#