##// 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:

r21486:16352b34 default
r26978:9b9d4bcc default
Show More
changelogentry.tmpl
40 lines | 1.3 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <item>
Aaron Jensen
hgweb: adding branch names from inbranch template to rss feed
r21118 <title>{inbranch%"{if(name, '[{name|escape}] ')}"}{branches%"{if(name, '[{name|escape}] ')}"}{desc|strip|firstline|strip|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <guid isPermaLink="true">{urlbase}{url|urlescape}rev/{node|short}</guid>
Aaron Jensen
hgweb: adding article link to rss feed
r21119 <link>{urlbase}{url|urlescape}rev/{node|short}</link>
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
r21057 <description>
Aaron Jensen
hgweb: adding branch names from inbranch template to rss feed
r21118 <![CDATA[
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
r21057 <table>
<tr>
<th style="text-align:left;">changeset</th>
<td>{node|short}</td>
Aaron Jensen
hgweb: adding branch names from inbranch template to rss feed
r21118 </tr>
<tr>
<th style="text-align:left;">branch</th>
<td>{inbranch%"{name|escape}"}{branches%"{name|escape}"}</td>
</tr>
<tr>
<th style="text-align:left;">bookmark</th>
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
r21057 <td>{bookmarks%"{name|escape}"}</td>
</tr>
<tr>
<th style="text-align:left;">tag</th>
<td>{tags%"{name|escape}"}</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">user</th>
<td>{author|obfuscate}</td>
</tr>
<tr>
<th style="text-align:left;vertical-align:top;">description</th>
Steven Brown
hgweb: apply websub filter to the changeset description in rss and atom feeds...
r21486 <td>{desc|strip|escape|websub|addbreaks|nonempty}</td>
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
r21057 </tr>
<tr>
<th style="text-align:left;vertical-align:top;">files</th>
<td>{files}</td>
</tr>
</table>
]]></description>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <author>{author|obfuscate}</author>
<pubDate>{date|rfc822date}</pubDate>
</item>