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

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

filemerge: introduce class whose objects represent files not in a context...
filemerge: introduce class whose objects represent files not in a context Most code is going to barf at the return values here (particularly from data and size), so we restrict it to the filemerge code. This is already somewhat supported via: ctx.filectx(f, fileid=nullid) Indeed, for add/add conflicts (ancestor doesn't have the file) we use precisely that. However, that is broken in subtle ways: - The cmp() function in filectx returns False (identical) for such a filectx when compared to a zero-length file. - size() returns 0 rather than some sort of value indicating that the file isn't present. - data() returns '' rather than some sort of value indicating that the file isn't present. Given the relatively niche use of such filectxes, this seems to be the simplest way to fix all these issues.
Alexander Plavin - - Load All Authors

File last commit:

r19429:c8490dcc default
r26979:7b038ec6 default
Show More
map
42 lines | 1.2 KiB | text/plain | TextLexer
/ mercurial / templates / raw / map
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
hgweb: avoid traceback if raw is used as default style...
 r17277 default = 'shortlog'
shortlog = "'raw' is not a browsable style"
Alexander Plavin
hgweb: add changelog and search templates to raw style...
 r19429 changelog = changelog.tmpl
changelogentry = logentry.tmpl
search = search.tmpl
searchentry = logentry.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 mimetype = 'text/plain; charset={encoding}'
header = ''
footer = ''
changeset = changeset.tmpl
difflineplus = '{line}'
difflineminus = '{line}'
difflineat = '{line}'
diffline = '{line}'
changesetparent = '# Parent {node}'
changesetchild = '# Child {node}'
filenodelink = ''
Matt Mackall
templates: add filenolink to raw style (issue2332)
 r11936 filenolink = ''
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 fileline = '{line}'
diffblock = '{lines}'
filediff = filediff.tmpl
fileannotate = fileannotate.tmpl
annotateline = '{author|user}@{rev}: {line}'
manifest = manifest.tmpl
direntry = 'drwxr-xr-x {basename}\n'
fileentry = '{permissions|permissions} {size} {basename}\n'
index = index.tmpl
notfound = notfound.tmpl
error = error.tmpl
indexentry = '{url}\n'
tags = '{entries%tagentry}'
tagentry = '{tag} {node}\n'
Yuya Nishihara
hgweb: add bookmarks listing to raw style with test case
 r13921 bookmarks = '{entries%bookmarkentry}'
bookmarkentry = '{bookmark} {node}\n'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 branches = '{entries%branchentry}'
branchentry = '{branch} {node} {status}\n'
Paul Boddie
hgweb: make graph data suitable for template usage...
 r16773 graph = graph.tmpl
graphnode = graphnode.tmpl
graphedge = graphedge.tmpl
bookmarkname = 'bookmark: {name}\n'
branchname = 'branch: {name}\n'
tagname = 'tag: {name}\n'