##// END OF EJS Templates
merge: use constants for merge state record types...
merge: use constants for merge state record types merge.py is using multiple discrete sets of 1 and 2 letter constants to define types and behavior. To the uninitiated, the code is very difficult to reason about. I didn't even realize there were multiple sets of constants in play initially! We begin our sanity injection with merge state records. The record types (which are serialized to disk) are now defined in RECORD_* constants. Differential Revision: https://phab.mercurial-scm.org/D2698

File last commit:

r32762:2d93d215 default
r37127:a532b2f5 default
Show More
bookmarks.tmpl
35 lines | 1.2 KiB | application/x-cheetah | CheetahLexer
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 {header}
<title>{repo|escape}: Bookmarks</title>
<link rel="alternate" type="application/atom+xml"
av6
gitweb: describe feed type in links on /branches, /tags and /bookmarks
r27549 href="{url|urlescape}atom-bookmarks" title="Atom feed for {repo|escape}: bookmarks"/>
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 <link rel="alternate" type="application/rss+xml"
av6
gitweb: describe feed type in links on /branches, /tags and /bookmarks
r27549 href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}: bookmarks"/>
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 </head>
<body>
<div class="page_header">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
<a href="/">Mercurial</a> {pathdef%breadcrumb} / bookmarks
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 </div>
<div class="page_nav">
Gregory Szorc
hgweb: refresh styling of gitweb's search form...
r32762 <div>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url|urlescape}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 bookmarks |
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
av6
hgweb: don't point file links at tip hash where it doesn't make sense...
r25526 <a href="{url|urlescape}file{sessionvars%urlparameter}">files</a> |
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
Gregory Szorc
hgweb: refresh styling of gitweb's search form...
r32762 </div>
{searchform}
Yuya Nishihara
hgweb: add separate bookmarks listing to gitweb theme (based on 38c9837b1f75)
r13864 </div>
<div class="title">&nbsp;</div>
<table cellspacing="0">
{entries%bookmarkentry}
</table>
{footer}