##// END OF EJS Templates
rebase: don't use rebased node as dirstate p2 (BC)...
rebase: don't use rebased node as dirstate p2 (BC) When rebasing a node, we currently use the rebased node as p2 in the dirstate until just before we commit it (we then change to the desired parents). This p2 is visible to the user when the rebase gets interrupted because of merge conflicts. That can be useful to the user as a reminder of which commit is currently being rebased, but I believe it's incorrect for a few reasons: * I think the dirstate parents should be the ones that will be set when the commit is created. * I think having two parents means that you're merging those two commits, but when rebasing, you're generally grafting, not merging. * When rebasing a merge commit, we should use the two desired parents as dirstate parents (and we clearly can't have the rebased node as a third dirstate parent). * `hg graft` (and `hg update --merge`) sets only one parent and `hg rebase` should be consistent with that. I realize that this is a somewhat large user-visible change, but I think it's worth it because it will simplify things quite a bit. Differential Revision: https://phab.mercurial-scm.org/D7827

File last commit:

r38202:d6aa1fc8 default
r44821:9c9cfecd default
Show More
map
383 lines | 16.7 KiB | text/plain | TextLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 default = 'summary'
mimetype = 'text/html; charset={encoding}'
header = header.tmpl
footer = footer.tmpl
search = search.tmpl
changelog = changelog.tmpl
summary = summary.tmpl
error = error.tmpl
notfound = notfound.tmpl
Augie Fackler
web: add a help view for getting hg help output
r12666
help = help.tmpl
helptopics = helptopics.tmpl
Dan Villiom Podlaski Christiansen
hgweb help: split up long lines (in generated output)
r18745 helpentry = '
<tr><td>
<a href="{url|urlescape}help/{topic|escape}{sessionvars%urlparameter}">
Gregory Szorc
templates: differentiate between partial and full topic name...
r27579 {if(basename, '{basename|escape}', '{topic|escape}')}
Dan Villiom Podlaski Christiansen
hgweb help: split up long lines (in generated output)
r18745 </a>
</td><td>
{summary|escape}
</td></tr>'
Augie Fackler
web: add a help view for getting hg help output
r12666
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 naventry = '<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navshortentry = '<a href="{url|urlescape}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
navgraphentry = '<a href="{url|urlescape}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
filenaventry = '<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
filedifflink = '<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filenodelink = '
<tr class="parity{parity}">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td><a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td></td>
<td class="link">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> |
<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
<a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
filenolink = '
<tr class="parity{parity}">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td><a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td></td>
<td class="link">
file |
annotate |
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
<a href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> |
<a href="{url|urlescape}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254
nav = '{before%naventry} {after%naventry}'
navshort = '{before%navshortentry}{after%navshortentry}'
navgraph = '{before%navgraphentry}{after%navgraphentry}'
filenav = '{before%filenaventry}{after%filenaventry}'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 fileellipses = '...'
changelogentry = changelogentry.tmpl
changeset = changeset.tmpl
manifest = manifest.tmpl
av6
gitweb: don't show '[up]' in file view when in root directory already
r38202 updirentry = '
<tr class="parity{upparity}">
<td style="font-family:monospace">drwxr-xr-x</td>
<td style="font-family:monospace"></td>
<td style="font-family:monospace"></td>
<td>
<a href="{url|urlescape}file/{symrev}{up|urlescape}{sessionvars%urlparameter}">[up]</a>
</td>
<td class="link">&nbsp;</td>
</tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 direntry = '
<tr class="parity{parity}">
<td style="font-family:monospace">drwxr-xr-x</td>
<td style="font-family:monospace"></td>
<td style="font-family:monospace"></td>
<td>
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>
<a href="{url|urlescape}file/{symrev}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}">{emptydirs|escape}</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
<td class="link">
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
fileentry = '
<tr class="parity{parity}">
<td style="font-family:monospace">{permissions|permissions}</td>
<td style="font-family:monospace" align=right>{date|isodate}</td>
<td style="font-family:monospace" align=right>{size}</td>
<td class="list">
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a class="list" href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">{basename|escape}</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
<td class="link">
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 <a href="{url|urlescape}file/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
<a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> |
<a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
filerevision = filerevision.tmpl
fileannotate = fileannotate.tmpl
filediff = filediff.tmpl
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 filecomparison = filecomparison.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filelog = filelog.tmpl
fileline = '
av6
gitweb: visually highlight source lines when hovering over line numbers...
r26670 <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 annotateline = '
Denis Laxalde
hgweb: highlight data of the current revision in annotate view...
r29387 <tr id="{lineid}" style="font-family:monospace" class="parity{parity}{ifeq(node, originalnode, ' thisrev')}">
av6
gitweb: make different blocks of annotated lines have different colors
r29573 <td class="annotate linenr parity{blockparity}" style="text-align: right;">
Denis Laxalde
hgweb: display blamed revision once per block in annotate view...
r29388 {if(blockhead,
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 '<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
Denis Laxalde
hgweb: move author information from left-column to hover-box in annotate view...
r29524 {rev}
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 </a>')}
<div class="annotate-info">
Denis Laxalde
hgweb: add a link on node id in annotate hover-box...
r29525 <div>
<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}">
{node|short}</a>
{desc|escape|firstline}
</div>
Denis Laxalde
hgweb: move author information from left-column to hover-box in annotate view...
r29524 <div><em>{author|obfuscate}</em></div>
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 <div>parents: {parents%annotateparent}</div>
Denis Laxalde
hgweb: add links to diff and changeset in hover-box on annotate view
r29523 <a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a>
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a>
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 </div>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 <td class="followlines-btn-parent"><pre><a class="linenr" href="#{lineid}">{linenumber}</a></pre></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td><pre>{line|escape}</pre></td>
</tr>'
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 annotateparent = '
<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}</a>'
av6
gitweb: port code selection without line numbers from paper...
r26288 difflineplus = '
av6
gitweb: visually highlight source lines when hovering over line numbers...
r26670 <a href="#{lineid}"></a><span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span>'
av6
gitweb: port code selection without line numbers from paper...
r26288 difflineminus = '
av6
gitweb: visually highlight source lines when hovering over line numbers...
r26670 <a href="#{lineid}"></a><span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span>'
av6
gitweb: port code selection without line numbers from paper...
r26288 difflineat = '
av6
gitweb: visually highlight source lines when hovering over line numbers...
r26670 <a href="#{lineid}"></a><span id="{lineid}" class="difflineat">{strip(line|escape, '\r\n')}</span>'
av6
gitweb: port code selection without line numbers from paper...
r26288 diffline = '
av6
gitweb: visually highlight source lines when hovering over line numbers...
r26670 <a href="#{lineid}"></a><span id="{lineid}">{strip(line|escape, '\r\n')}</span>'
wujek srujek
hgweb: side-by-side comparison functionality...
r17202
comparisonblock ='
<tbody class="block">
{lines}
</tbody>'
comparisonline = '
av6
gitweb, monoblue: port highlighting linked lines from paper...
r26363 <tr id="{lineid}" style="font-family:monospace">
<td class="{type}"><pre><a class="linenr" href="#{lineid}">{leftlinenumber}</a> {leftline|escape}</pre></td>
<td class="{type}"><pre><a class="linenr" href="#{lineid}">{rightlinenumber}</a> {rightline|escape}</pre></td>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 </tr>'
Anton Shestakov
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...
r23740 changesetlink = '<a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 changesetbranch = '<tr><td>branch</td><td>{name|escape}</td></tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 changesetparent = '
<tr>
<td>parent {rev}</td>
<td style="font-family:monospace">
Anton Shestakov
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...
r23740 {changesetlink}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
Anton Shestakov
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...
r23740 changesetparentdiff = '
<tr>
<td>parent {rev}</td>
<td style="font-family:monospace">
Anton Shestakov
hgweb: remove unneeded escaping in gitweb/map and monoblue/map...
r24128 {changesetlink} {ifeq(node, basenode, '(current diff)', '({difffrom})')}
Anton Shestakov
hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...
r23740 </td>
</tr>'
difffrom = '<a href="{url|urlescape}rev/{node|short}:{originalnode|short}{sessionvars%urlparameter}">diff</a>'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 filerevbranch = '<tr><td>branch</td><td>{name|escape}</td></tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filerevparent = '
<tr>
<td>parent {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {rename%filerename}{node|short}
</a>
</td>
</tr>'
filerename = '{file|escape}@'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 filelogrename = '| <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">base</a>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 fileannotateparent = '
<tr>
<td>parent {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {rename%filerename}{node|short}
</a>
</td>
</tr>'
changesetchild = '
<tr>
<td>child {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
filerevchild = '
<tr>
<td>child {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>'
fileannotatechild = '
<tr>
<td>child {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>'
tags = tags.tmpl
tagentry = '
<tr class="parity{parity}">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age"><i class="age">{date|rfc822date}</i></td>
av6
gitweb: provide links to branches, tags and bookmarks by name...
r26390 <td><a class="list" href="{url|urlescape}rev/{tag|revescape}{sessionvars%urlparameter}"><b>{tag|escape}</b></a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="link">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 bookmarks = bookmarks.tmpl
bookmarkentry = '
<tr class="parity{parity}">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age"><i class="age">{date|rfc822date}</i></td>
av6
gitweb: provide links to branches, tags and bookmarks by name...
r26390 <td><a class="list" href="{url|urlescape}rev/{bookmark|revescape}{sessionvars%urlparameter}"><b>{bookmark|escape}</b></a></td>
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 <td class="link">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 </td>
</tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 branches = branches.tmpl
branchentry = '
<tr class="parity{parity}">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age"><i class="age">{date|rfc822date}</i></td>
av6
gitweb: provide links to branches, tags and bookmarks by name...
r26390 <td class="{status}"><a class="list" href="{url|urlescape}shortlog/{branch|revescape}{sessionvars%urlparameter}"><b>{branch|escape}</b></a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="link">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}changeset/{node|short}{sessionvars%urlparameter}">changeset</a> |
<a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
av6
gitweb: port code selection without line numbers from paper...
r26288 diffblock = '<div class="diffblock"><pre class="sourcelines">{lines}</pre></div>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filediffparent = '
<tr>
<td>parent {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {node|short}
</a>
</td>
</tr>'
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 filecompparent = '
<tr>
<td>parent {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 {node|short}
</a>
</td>
</tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 filediffchild = '
<tr>
<td>child {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 filecompchild = '
<tr>
<td>child {rev}</td>
<td style="font-family:monospace">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a>
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 </td>
</tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 shortlog = shortlog.tmpl
graph = graph.tmpl
av6
gitweb: render changesets server-side on /graph page
r35220 graphentry = graphentry.tmpl
av6
hgweb: show commit phase if it's not public...
r35064 phasetag = '{ifeq(phase, 'public', '', '<span class="phasetag" title="{phase|escape}">{phase|escape}</span> ')}'
av6
hgweb: show obsolescence status of a commit...
r35088 obsoletetag = '{if(obsolete, '<span class="obsoletetag" title="obsolete">obsolete</span> ')}'
av6
hgweb: rename the main attribute of instabilities...
r35129 instabilitytag = '<span class="instabilitytag" title="{instability|escape}">{instability|escape}</span> '
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 tagtag = '<span class="tagtag" title="{name|escape}">{name|escape}</span> '
branchtag = '<span class="branchtag" title="{name|escape}">{name|escape}</span> '
inbranchtag = '<span class="inbranchtag" title="{name|escape}">{name|escape}</span> '
bookmarktag = '<span class="bookmarktag" title="{name|escape}">{name|escape}</span> '
av6
hgweb: show instabilities of a commit...
r35093 alltags = '<span class="logtags">{phasetag}{obsoletetag}{instabilities%instabilitytag}{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>'
av6
hgweb: link to successors of obsoleted changesets...
r35502 successorlink = '<a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
obsfatesuccessors = '{if(successors, ' as ')}{successors%successorlink}'
av6
hgweb: display fate of obsolete changesets...
r35501 obsfateverb = '{obsfateverb(successors, markers)}'
obsfateoperations = '{if(obsfateoperations(markers), ' using {join(obsfateoperations(markers), ', ')}')}'
av6
hgweb: show users recorded in obsolescence markers...
r36213 obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}'
av6
hgweb: show dates recorded in obsolescence markers...
r36251 obsfatedate = '{if(obsfatedate(markers), ' {ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), '<span class="age">{min(obsfatedate(markers))|rfc822date}</span>', 'between <span class="age">{min(obsfatedate(markers))|rfc822date}</span> and <span class="age">{max(obsfatedate(markers))|rfc822date}</span>')}')}'
av6
hgweb: show each obsfateentry on its own line...
r36340 obsfateentry = '
<tr>
<td>obsolete</td>
<td>{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}</td>
</tr>'
av6
hgweb: explain instabilities of unstable changesets (the rest of the themes)
r37042 instabilitychangesetlink = '<a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
divergentnode = '{instabilitychangesetlink} ({phase})'
whyunstableentry = '
<tr>
<td>unstable</td>
<td>{instability}: {if(divergentnodes, divergentnodes%divergentnode)} {reason} {instabilitychangesetlink}</td>
</tr>'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 shortlogentry = '
<tr class="parity{parity}">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age"><i class="age">{date|rfc822date}</i></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td><i>{author|person}</i></td>
<td>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <b>{desc|strip|firstline|escape|nonempty}</b>
av6
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...
r35052 {alltags}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </a>
</td>
<td class="link" nowrap>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
<a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </td>
</tr>'
filelogentry = '
Denis Laxalde
gitweb: handle "patch" query parameter in filelog view...
r31948 <tr class="parity{if(patch, '1', '{parity}')}">
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age"><i class="age">{date|rfc822date}</i></td>
av6
gitweb: add author to filelogentry...
r26275 <td><i>{author|person}</i></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <b>{desc|strip|firstline|escape|nonempty}</b>
av6
hgweb: move changeset "tags" to a template in map file (gitweb and monoblue)...
r35052 {alltags}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </a>
</td>
<td class="link">
Anton Shestakov
hgweb: split some long lines in paper, gitweb and monoblue styles...
r25108 <a href="{url|urlescape}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
<a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
<a href="{url|urlescape}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a>
{rename%filelogrename}
</td>
Denis Laxalde
gitweb: handle "patch" query parameter in filelog view...
r31948 </tr>
{if(patch, '<tr><td colspan="4">{diff}</td></tr>')}'
av6
hgweb: don't dereference symbolic revision in gitweb style...
r25605 archiveentry = ' | <a href="{url|urlescape}archive/{symrev}{extension}{ifeq(path,'/','',path|urlescape)}">{type|escape}</a> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 indexentry = '
<tr class="parity{parity}">
<td>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a class="list" href="{url|urlescape}{sessionvars%urlparameter}">
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <b>{name|escape}</b>
</a>
</td>
<td>{description}</td>
<td>{contact|obfuscate}</td>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="age">{lastchange|rfc822date}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="indexlinks">{archives%indexarchiveentry}</td>
Angel Ezquerra
hgwebdir: do not show RSS and Atom links for plain directories...
r18046 <td>{if(isdirectory, '',
'<div class="rss_logo">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}rss-log">RSS</a> <a href="{url|urlescape}atom-log">Atom</a>
Angel Ezquerra
hgwebdir: do not show RSS and Atom links for plain directories...
r18046 </div>'
)}
</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>\n'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 indexarchiveentry = ' <a href="{url|urlescape}archive/{node|short}{extension}">{type|escape}</a> '
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 index = index.tmpl
urlparameter = '{separator}{name}={value|urlescape}'
hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 breadcrumb = '&gt; <a href="{url|urlescape}">{name|escape}</a> '
Gregory Szorc
hgweb: consolidate search form for gitweb
r32760
searchform = '
Gregory Szorc
hgweb: refresh styling of gitweb's search form...
r32762 <div class="search">
<form id="searchform" action="{url|urlescape}log">
{sessionvars%hiddenformentry}
<input name="rev" type="text" value="{query|escape}" size="40" />
<div id="hint">{searchhint}</div>
</form>
</div>'
searchhint = 'Find changesets by keywords (author, files, the commit message), revision
number or hash, or <a href="{url|urlescape}help/revsets">revset expression</a>.'
Gregory Szorc
hgweb: add HTML elements to control whitespace settings for annotate...
r34392
diffoptsform = '
<form id="diffopts-form"
data-ignorews="{if(get(diffopts, 'ignorews'), '1', '0')}"
data-ignorewsamount="{if(get(diffopts, 'ignorewsamount'), '1', '0')}"
data-ignorewseol="{if(get(diffopts, 'ignorewseol'), '1', '0')}"
data-ignoreblanklines="{if(get(diffopts, 'ignoreblanklines'), '1', '0')}">
<span>Ignore whitespace changes - </span>
<span>Everywhere:</span>
<input id="ignorews-checkbox" type="checkbox" />
<span>Within whitespace:</span>
<input id="ignorewsamount-checkbox" type="checkbox" />
<span>At end of lines:</span>
<input id="ignorewseol-checkbox" type="checkbox" />
Gregory Szorc
hgweb: remove extra </div>...
r34403 </form>'