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

r18526:9409aeaa stable
r26978:9b9d4bcc default
Show More
branchentry.tmpl
6 lines | 224 B | application/x-cheetah | CheetahLexer
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 <item>
<title>{branch|escape}</title>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <link>{urlbase}{url|urlescape}rev/{node|short}</link>
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
r18045 <description><![CDATA[{branch|strip|escape|addbreaks}]]></description>
<pubDate>{date|rfc822date}</pubDate>
</item>