upstream/mercurial-mirror Files · tests/test-convert-bzr-ghosts.t

mq: use dirstateguard instead of dirstate.invalidate (qrefresh)...

mq: use dirstateguard instead of dirstate.invalidate (qrefresh) Before this patch, "mq.queue.refresh()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during a failure. 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" during a failure even if "dirstate.write()" is executed before a failure. This patch also removes "beginparentchage()" and "endparentchange()", because "dirstateguard" makes them useless. 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).

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24997:12f3c714

default

Download file

             test-convert-bzr-ghosts.t
        
                    38 lines
            
             | 950 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-ghosts.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ . "$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

        o  1@source "Commit with ghost revision" files: somefile

        |

        o  0@source "Initial layout setup" files: somefile

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages


				$ . "$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
				o 1@source "Commit with ghost revision" files: somefile
				\|
				o 0@source "Initial layout setup" files: somefile


				$ cd ..