Mercurial > hg
view tests/test-simple-update.t @ 50195:11e6eee4b063
transaction: use the standard transaction mechanism to backup branch
Branch is a bit special :
- It currently does not collaborate with the transaction (or any scoping) for
writing (this is bad)
- It can change without the lock being taken (it is protected by `wlock`)
So we rely on the same mechanism as for the backup of the other dirstate file:
- we only do a backup if we hold the wlock
- we force a backup though the transaction
Since "branch" write does not collaborate with the transaction, we cannot back
it up "at the last minute" as we do for the dirstate. We have to back it up
"upfront". Since we have a backup, the transaction is no longer doing its
"quick_abort" and get noisy. Which is quite annoying. To work around this, and
to avoid jumping in yet-another-rabbit-hole of "getting branch written
properly", I am doing horrible things to the transaction in the meantime.
We should be able to get this code go away during the next cycle.
In the meantime, I prefer to take this small stop so that we stop abusing the
"journal" and "undo" mechanism instead of the proper backup mechanism of the
transaction.
Also note that this change regress the warning message for the legacy fallback
introduced in 2008 when issue902 got fixed in dd5a501cb97f (Mercurial 1.0).
I feel like this is fine as issue 902 remains fixed, and this would only affect
people deploying a mix of 15 year old Mercurial and modern mercurial, and using
branch and rollback extensively.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 23 Feb 2023 15:37:46 +0100 |
parents | 2f2682f40ea0 |
children | 8b7123c8947b |
line wrap: on
line source
$ hg init test $ cd test $ echo foo>foo $ hg addremove adding foo $ hg commit -m "1" $ hg verify -q $ hg clone . ../branch updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ../branch $ hg co 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo bar>>foo $ hg commit -m "2" -d '1 0' $ cd ../test $ hg pull ../branch pulling from ../branch searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets 84b9316f7b31 1 local changesets published (run 'hg update' to get a working copy) $ hg verify -q $ hg co 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat foo foo bar $ hg manifest --debug 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo update to rev 0 with a date $ hg upd -d foo 0 abort: you can't specify a revision and a date [10] update by date $ hg update -d '<1970-01-01 00:00:02 +0000' found revision 1 from Thu Jan 01 00:00:01 1970 +0000 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg update -d '<1970-01-01 00:00:01 +0000' found revision 1 from Thu Jan 01 00:00:01 1970 +0000 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg update -d '<1970-01-01 00:00:00 +0000' found revision 0 from Thu Jan 01 00:00:00 1970 +0000 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg update -d '>1970-01-01 00:00:02 +0000' abort: revision matching date not found [10] $ hg update -d '>1970-01-01 00:00:01 +0000' found revision 1 from Thu Jan 01 00:00:01 1970 +0000 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg update -d '>1970-01-01 00:00:00 +0000' found revision 1 from Thu Jan 01 00:00:01 1970 +0000 0 files updated, 0 files merged, 0 files removed, 0 files unresolved update to default destination (with empty revspec) $ hg update -q null $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id 84b9316f7b31 tip $ hg update -q null $ hg update -r '' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id 84b9316f7b31 tip $ hg update -q null $ hg update '' 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg id 84b9316f7b31 tip $ cd .. update with worker processes #if no-windows $ cat <<EOF > forceworker.py > from mercurial import extensions, worker > def nocost(orig, ui, costperop, nops, threadsafe=True): > return worker._numworkers(ui) > 1 > def uisetup(ui): > extensions.wrapfunction(worker, 'worthwhile', nocost) > EOF $ hg init worker $ cd worker $ cat <<EOF >> .hg/hgrc > [extensions] > forceworker = $TESTTMP/forceworker.py > [worker] > numcpus = 4 > EOF $ for i in `"$PYTHON" $TESTDIR/seq.py 1 100`; do > echo $i > $i > done $ hg ci -qAm 'add 100 files' $ hg update null 0 files updated, 0 files merged, 100 files removed, 0 files unresolved $ hg update -v | grep 100 getting 100 100 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg status $ cd .. #endif