upstream/mercurial-mirror Files · tests/test-pull-pull-corruption.t

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r24995:0579b0c2

default

Download file

             test-pull-pull-corruption.t
        
                    72 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-pull-corruption.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Corrupt an hg repo with two pulls.

      create one repo with a long history

        $ hg init source1

        $ cd source1

        $ touch foo

        $ hg add foo

        $ for i in 1 2 3 4 5 6 7 8 9 10; do

        >     echo $i >> foo

        >     hg ci -m $i

        > done

        $ cd ..

      create one repo with a shorter history

        $ hg clone -r 0 source1 source2

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd source2

        $ echo a >> foo

        $ hg ci -m a

        $ cd ..

      create a third repo to pull both other repos into it

        $ hg init corrupted

        $ cd corrupted

      use a hook to make the second pull start while the first one is still running

        $ echo '[hooks]' >> .hg/hgrc

        $ echo 'prechangegroup = sleep 5' >> .hg/hgrc

      start a pull...

        $ hg pull ../source1 > pull.out 2>&1 &

      ... and start another pull before the first one has finished

        $ sleep 1

        $ hg pull ../source2 2>/dev/null

        pulling from ../source2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ cat pull.out

        pulling from ../source1

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 10 changesets with 10 changes to 1 files

        (run 'hg update' to get a working copy)

      see the result

        $ wait

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 11 changesets, 11 total revisions

        $ 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

				Corrupt an hg repo with two pulls.
				create one repo with a long history

				$ hg init source1
				$ cd source1
				$ touch foo
				$ hg add foo
				$ for i in 1 2 3 4 5 6 7 8 9 10; do
				> echo $i >> foo
				> hg ci -m $i
				> done
				$ cd ..

				create one repo with a shorter history

				$ hg clone -r 0 source1 source2
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd source2
				$ echo a >> foo
				$ hg ci -m a
				$ cd ..

				create a third repo to pull both other repos into it

				$ hg init corrupted
				$ cd corrupted

				use a hook to make the second pull start while the first one is still running

				$ echo '[hooks]' >> .hg/hgrc
				$ echo 'prechangegroup = sleep 5' >> .hg/hgrc

				start a pull...

				$ hg pull ../source1 > pull.out 2>&1 &

				... and start another pull before the first one has finished

				$ sleep 1
				$ hg pull ../source2 2>/dev/null
				pulling from ../source2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files (+1 heads)
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ cat pull.out
				pulling from ../source1
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 10 changesets with 10 changes to 1 files
				(run 'hg update' to get a working copy)

				see the result

				$ wait
				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 11 changesets, 11 total revisions

				$ cd ..