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

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Matt Mackall - - Load All Authors

File last commit:

r12412:2dbb9e5e default


                r13155:f02d7a56

default

Download file

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

      Corrupt an hg repo with a pull started during an aborted commit

      Create two repos, so that one of them can pull from the other one.

        $ hg init source

        $ cd source

        $ touch foo

        $ hg add foo

        $ hg ci -m 'add foo'

        $ hg clone . ../corrupted

        updating to branch default

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

        $ echo >> foo

        $ hg ci -m 'change foo'

      Add a hook to wait 5 seconds and then abort the commit

        $ cd ../corrupted

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

        $ echo 'pretxncommit = sleep 5; exit 1' >> .hg/hgrc

      start a commit...

        $ touch bar

        $ hg add bar

        $ hg ci -m 'add bar' &

      ... and start a pull while the commit is still running

        $ sleep 1

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

        pulling from ../source

        transaction abort!

        rollback completed

        abort: pretxncommit hook exited with status 1

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

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

      see what happened

        $ wait

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 2 changesets, 2 total revisions

	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 a pull started during an aborted commit
				Create two repos, so that one of them can pull from the other one.

				$ hg init source
				$ cd source
				$ touch foo
				$ hg add foo
				$ hg ci -m 'add foo'
				$ hg clone . ../corrupted
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo >> foo
				$ hg ci -m 'change foo'

				Add a hook to wait 5 seconds and then abort the commit

				$ cd ../corrupted
				$ echo '[hooks]' >> .hg/hgrc
				$ echo 'pretxncommit = sleep 5; exit 1' >> .hg/hgrc

				start a commit...

				$ touch bar
				$ hg add bar
				$ hg ci -m 'add bar' &

				... and start a pull while the commit is still running

				$ sleep 1
				$ hg pull ../source 2>/dev/null
				pulling from ../source
				transaction abort!
				rollback completed
				abort: pretxncommit hook exited with status 1
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)

				see what happened

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