##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Aaron Jensen - - Load All Authors

File last commit:

r21057:19ee4923 default
r26978:9b9d4bcc default
Show More
map
18 lines | 530 B | text/plain | TextLexer
/ mercurial / templates / rss / map
History | Source | Raw |Copy content |Copy permalink
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 default = 'changelog'
mimetype = 'text/xml; charset={encoding}'
header = header.tmpl
changelog = changelog.tmpl
changelogentry = changelogentry.tmpl
filelog = filelog.tmpl
filelogentry = filelogentry.tmpl
tags = tags.tmpl
tagentry = tagentry.tmpl
Yuya Nishihara
hgweb: add missing bookmarks templates to atom/rss styles...
 r13858 bookmarks = bookmarks.tmpl
bookmarkentry = bookmarkentry.tmpl
Angel Ezquerra
hgweb: add branches RSS and Atom feeds...
 r18045 branches = branches.tmpl
branchentry = branchentry.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 error = error.tmpl
Aaron Jensen
hgweb: adding branch, tags, bookmarks, user, and file list to rss feed entries
 r21057 filedifflink = '{file|escape}<br />'
fileellipses = '{file|escape}<br />'
filenodelink = '{file|escape}<br />'
filenolink = '{file|escape}<br />'