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

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

largefiles: avoid redundant "updatelfiles" invocation in "overridetransplant"...
largefiles: avoid redundant "updatelfiles" invocation in "overridetransplant" At "hg transplant --merge REV", largefiles newly coming from the 2nd parent (= REV) are marked as "a"(dded) by "patch.patch()", and have to be marked as "n"(ormal) after commit. But until changeset 3100d1cbce32, such largefiles were still marked as "a" unexpectedly even after commit, because no additional entry is added to filelog of such largefiles and they aren't listed in "repo[newnode].files()" in this case: "newnode" is one of newly committed changeset (= result of "repo.commit()"). "updatelfiles" invocation in "overridetransplant" shadows this problem by forcibly synchronizing lfdirstate to dirstate. Now, "updatelfiles" invocation in "overridetransplant" is redundant, because changeset 3100d1cbce32 made "markcommitted" use "ctx.files()" to get targets of "synclfdirstate" instead of "repo[newnode].files()".
Alexander Plavin - - Load All Authors

File last commit:

r19429:c8490dcc default
r23273:236c978b 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'