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

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

share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...
share: wrap bmstore._writerepo for transaction sensitivity (issue4940) 46dec89fe888 made 'bmstore.write()' transaction sensitive, to restore original bookmarks correctly at failure of a transaction. For example, shelve and unshelve imply steps below: before 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' writes updated ones into .hg/bookmarks 3. rollback transaction to remove internal commits 4. restore updated bookmarks manually after 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' doesn't write updated ones into .hg/bookmarks (these are written into .hg/bookmarks.pending, if external hook is spawn) 3. rollback transaction to remove internal commits 4. .hg/bookmarks should be clean, because it isn't changed while transaction running: see (2) above But if shelve or unshelve is executed in the repository created with "shared bookmarks" ("hg share -B"), this doesn't work as expected, because: - share extension makes 'bmstore.write()' write updated bookmarks into .hg/bookmarks of shared source repository regardless of transaction activity, and - intentional transaction failure at the end of shelve/unshelve doesn't restore already updated .hg/bookmarks of shared source This patch makes share extension wrap 'bmstore._writerepo()' instead of 'bmstore.write()', because the former is used to actually write bookmark changes out.
av6 - - Load All Authors

File last commit:

r26283:c450265b default
r26933:a7eecd02 stable
Show More
map
34 lines | 950 B | text/plain | TextLexer
/ mercurial / templates / coal / map
History | Source | Raw |Copy content |Copy permalink
av6
coal: reuse all templates from paper/map by %including the file...
 r26283 %include paper/map
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999
footer = ../paper/footer.tmpl
search = ../paper/search.tmpl
changelog = ../paper/shortlog.tmpl
shortlog = ../paper/shortlog.tmpl
shortlogentry = ../paper/shortlogentry.tmpl
graph = ../paper/graph.tmpl
Augie Fackler
web: add a help view for getting hg help output
 r12666 help = ../paper/help.tmpl
helptopics = ../paper/helptopics.tmpl
Steven Brown
paper, coal: define the diffstat templates...
 r14563 diffstatlink = ../paper/diffstat.tmpl
diffstatnolink = ../paper/diffstat.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 changelogentry = ../paper/shortlogentry.tmpl
searchentry = ../paper/shortlogentry.tmpl
changeset = ../paper/changeset.tmpl
manifest = ../paper/manifest.tmpl
filerevision = ../paper/filerevision.tmpl
fileannotate = ../paper/fileannotate.tmpl
filediff = ../paper/filediff.tmpl
wujek srujek
hgweb: side-by-side comparison functionality...
 r17202 filecomparison = ../paper/filecomparison.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999 filelog = ../paper/filelog.tmpl
filelogentry = ../paper/filelogentry.tmpl
av6
coal: reuse all templates from paper/map by %including the file...
 r26283 tags = ../paper/tags.tmpl
bookmarks = ../paper/bookmarks.tmpl
branches = ../paper/branches.tmpl
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
 r9999
index = ../paper/index.tmpl
notfound = ../paper/notfound.tmpl
error = ../paper/error.tmpl