##// END OF EJS Templates
strip: add a delayedstrip method that works in a transaction...
strip: add a delayedstrip method that works in a transaction For long, the fact that strip does not work inside a transaction and some code has to work with both obsstore and fallback to strip lead to duplicated code like: with repo.transaction(): .... if obsstore: obsstore.createmarkers(...) if not obsstore: repair.strip(...) Things get more complex when you want to call something which may call strip under the hood. Like you cannot simply write: with repo.transaction(): .... rebasemod.rebase(...) # may call "strip", so this doesn't work But you do want rebase to run inside a same transaction if possible, so the code may look like: with repo.transaction(): .... if obsstore: rebasemod.rebase(...) obsstore.createmarkers(...) if not obsstore: rebasemod.rebase(...) repair.strip(...) That's ugly and error-prone. Ideally it's possible to just write: with repo.transaction(): rebasemod.rebase(...) saferemovenodes(...) This patch is the first step towards that. It adds a "delayedstrip" method to repair.py which maintains a postclose callback in the transaction object.

File last commit:

r28827:1e184241 default
r33087:fcd1c483 default
Show More
map-cmdline.compact
30 lines | 1006 B | text/plain | TextLexer
timeless
compact: add color labels to -Tcompact
r28827 ldate = '{label("log.date",
"{date|isodate}")}'
ldesc = '{label('ui.note log.description',
'{desc|strip}')}'
ldescfirst = '{label('ui.note log.description',
'{desc|firstline|strip}')}'
changeset = '{lrev}{tags}{bookmarks}{parents} {lnode} {ldate} {luser}\n {ldescfirst}\n\n'
changeset_quiet = '{lrev}:{lnode}\n'
changeset_verbose = '{lrev}{tags}{parents} {lnode} {ldate} {lauthor}\n {ldesc}\n\n'
lrev = '{label("log.changeset changeset.{phase}",
"{rev}")}'
lnode = '{label("log.node",
"{node|short}")}'
lauthor = '{label("log.user",
"{author}")}'
luser = '{label("log.user",
"{author|user}")}'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 start_tags = '['
timeless
compact: add color labels to -Tcompact
r28827 tag = '{label("log.tag",
"{tag},")}'
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 last_tag = '{tag}]'
start_parents = ':'
timeless
compact: add color labels to -Tcompact
r28827 parent = '{lrev},'
last_parent = '{lrev}'
Augie Fackler
compact style: show bookmarks in the same manner as tags
r13933 start_bookmarks = '['
timeless
compact: add color labels to -Tcompact
r28827 bookmark = '{label("log.bookmark",
"{bookmark},")}'
Augie Fackler
compact style: show bookmarks in the same manner as tags
r13933 last_bookmark = '{bookmark}]'