Mercurial > hg
view tests/helpers-testrepo.sh @ 33087:fcd1c483f5ea
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.
author | Jun Wu <quark@fb.com> |
---|---|
date | Sun, 25 Jun 2017 10:38:45 -0700 |
parents | 3c9066ed557c |
children | 6c113a7dec52 |
line wrap: on
line source
# The test-repo is a live hg repository which may have evolution # markers created, e.g. when a ~/.hgrc enabled evolution. # # Tests are run using a custom HGRCPATH, which do not # enable evolution markers by default. # # If test-repo includes evolution markers, and we do not # enable evolution markers, hg will occasionally complain # when it notices them, which disrupts tests resulting in # sporadic failures. # # Since we aren't performing any write operations on the # test-repo, there's no harm in telling hg that we support # evolution markers, which is what the following lines # for the hgrc file do: cat >> $HGRCPATH << EOF [experimental] evolution=createmarkers EOF