##// END OF EJS Templates
mq: use dirstateguard instead of dirstate.invalidate (qpush)...
mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" at failure even if "dirstate.write()" is executed before failure. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

File last commit:

r16913:f2719b38 default
r24996:58308dde default
Show More
test-convert-bzr-ghosts.t
38 lines | 950 B | text/troff | Tads3Lexer
/ tests / test-convert-bzr-ghosts.t
Matt Mackall
tests: unify test-convert-bzr-ghosts
r12515
$ . "$TESTDIR/bzr-definitions"
$ cat > ghostcreator.py <<EOF
> import sys
> from bzrlib import workingtree
> wt = workingtree.WorkingTree.open('.')
>
> message, ghostrev = sys.argv[1:]
> wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])
> wt.commit(message)
> EOF
ghost revisions
$ mkdir test-ghost-revisions
$ cd test-ghost-revisions
$ bzr init -q source
$ cd source
$ echo content > somefile
$ bzr add -q somefile
$ bzr commit -q -m 'Initial layout setup'
$ echo morecontent >> somefile
$ python ../../ghostcreator.py 'Commit with ghost revision' ghostrev
$ cd ..
$ hg convert source source-hg
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Initial layout setup
0 Commit with ghost revision
$ glog -R source-hg
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 o 1@source "Commit with ghost revision" files: somefile
Matt Mackall
tests: unify test-convert-bzr-ghosts
r12515 |
Patrick Mezard
convert/bzr: convert all branches (issue3229) (BC)...
r16060 o 0@source "Initial layout setup" files: somefile
Matt Mackall
tests: unify test-convert-bzr-ghosts
r12515
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..