Mercurial > hg
view tests/test-check-config.t @ 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 | 75be14993fda |
children | 6c113a7dec52 |
line wrap: on
line source
#require test-repo $ . "$TESTDIR/helpers-testrepo.sh" Sanity check check-config.py $ cat > testfile.py << EOF > # Good > foo = ui.config('ui', 'username') > # Missing > foo = ui.config('ui', 'doesnotexist') > # Missing different type > foo = ui.configint('ui', 'missingint') > # Missing with default value > foo = ui.configbool('ui', 'missingbool1', default=True) > foo = ui.configbool('ui', 'missingbool2', False) > EOF $ cat > files << EOF > mercurial/help/config.txt > $TESTTMP/testfile.py > EOF $ cd "$TESTDIR"/.. $ $PYTHON contrib/check-config.py < $TESTTMP/files undocumented: ui.doesnotexist (str) undocumented: ui.missingbool1 (bool) [True] undocumented: ui.missingbool2 (bool) undocumented: ui.missingint (int) New errors are not allowed. Warnings are strongly discouraged. $ hg files "set:(**.py or **.txt) - tests/**" | sed 's|\\|/|g' | > $PYTHON contrib/check-config.py limit = ui.configwith(fraction, 'profiling', 'showmin', 0.05) conflict on profiling.showmin: ('with', '0.05') != ('with', '0.005')