##// END OF EJS Templates
filectx: add isabsent method...
filectx: add isabsent method This will indicate whether this filectx represents a file that is *not* in a changectx. This will be used by merge and filemerge code to know about when a conflict is a change/delete conflict. While this is kind of hacky, it is the least bad of all the alternatives. Other options considered but rejected include: - isinstance(fctx, ...) -- not very Pythonic, doesn't support duck typing - fctx.size() is None -- the 'size()' call on workingfilectxes causes a disk stat - fctx.filenode() == nullid -- the semantics around filenode are incredibly confusing. In particular, for workingfilectxes, filenode() is always None no matter whether the file is present on disk or in either parent. Having different behavior for None versus nullid in the merge code is just asking for pain. Thanks to Pierre-Yves David for early review feedback here.

File last commit:

r26021:b57d05ca default
r26978:9b9d4bcc default
Show More
index.tmpl
35 lines | 1001 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
av6
monoblue: don't try to show repo on hgwebdir index page...
r25746 <title>Mercurial repositories index</title>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </head>
<body>
<div id="container">
<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258 <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h1>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <ul class="page-nav">
</ul>
</div>
Thomas Arendsen Hein
trailing spaces (and one stray tab)
r10575
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <table cellspacing="0">
<tr>
<td><a href="?sort={sort_name}">Name</a></td>
<td><a href="?sort={sort_description}">Description</a></td>
<td><a href="?sort={sort_contact}">Contact</a></td>
Dan Villiom Podlaski Christiansen
templates: rename `Last change' column in hgwebdir repository list....
r10301 <td><a href="?sort={sort_lastchange}">Last modified</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
{entries%indexentry}
</table>
<div class="page-footer">
{motd}
</div>
<div id="powered-by">
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <p><a href="{logourl}" title="Mercurial"><img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a></p>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
</div>
av6
hgweb: show ages in repos' Last modified column in monoblue and gitweb...
r25871 <script type="text/javascript">process_dates()</script>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </body>
</html>