upstream/mercurial-mirror Files · tests/test-push-validation.t

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Mads Kiilerich - - Load All Authors

File last commit:

r18506:ef60083b stable


                r22287:f3ac9677

default

Download file

             test-push-validation.t
        
                    92 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-validation.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init test

        $ cd test

        $ cat > .hg/hgrc <<EOF

        > [server]

        > validate=1

        > EOF

        $ echo alpha > alpha

        $ echo beta > beta

        $ hg addr

        adding alpha

        adding beta

        $ hg ci -m 1

        $ cd ..

        $ hg clone test test-clone

        updating to branch default

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

      Test spurious filelog entries:

        $ cd test-clone

        $ echo blah >> beta

        $ cp .hg/store/data/beta.i tmp1

        $ hg ci -m 2

        $ cp .hg/store/data/beta.i tmp2

        $ hg -q rollback

        $ mv tmp2 .hg/store/data/beta.i

        $ echo blah >> beta

        $ hg ci -m '2 (corrupt)'

      Expected to fail:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

         beta@1: dddc47b3ba30 not in manifests

        2 files, 2 changesets, 4 total revisions

        1 integrity errors encountered!

        (first damaged changeset appears to be 1)

        [1]

        $ hg push

        pushing to $TESTTMP/test (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        transaction abort!

        rollback completed

        abort: received spurious file revlog entry

        [255]

        $ hg -q rollback

        $ mv tmp1 .hg/store/data/beta.i

        $ echo beta > beta

      Test missing filelog entries:

        $ cp .hg/store/data/beta.i tmp

        $ echo blah >> beta

        $ hg ci -m '2 (corrupt)'

        $ mv tmp .hg/store/data/beta.i

      Expected to fail:

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

         beta@1: dddc47b3ba30 in manifests not found

        2 files, 2 changesets, 2 total revisions

        1 integrity errors encountered!

        (first damaged changeset appears to be 1)

        [1]

        $ hg push

        pushing to $TESTTMP/test (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        transaction abort!

        rollback completed

        abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify

        [255]

        $ 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

				$ hg init test
				$ cd test

				$ cat > .hg/hgrc <<EOF
				> [server]
				> validate=1
				> EOF

				$ echo alpha > alpha
				$ echo beta > beta
				$ hg addr
				adding alpha
				adding beta
				$ hg ci -m 1

				$ cd ..
				$ hg clone test test-clone
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Test spurious filelog entries:

				$ cd test-clone
				$ echo blah >> beta
				$ cp .hg/store/data/beta.i tmp1
				$ hg ci -m 2
				$ cp .hg/store/data/beta.i tmp2
				$ hg -q rollback
				$ mv tmp2 .hg/store/data/beta.i
				$ echo blah >> beta
				$ hg ci -m '2 (corrupt)'

				Expected to fail:

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				beta@1: dddc47b3ba30 not in manifests
				2 files, 2 changesets, 4 total revisions
				1 integrity errors encountered!
				(first damaged changeset appears to be 1)
				[1]

				$ hg push
				pushing to $TESTTMP/test (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				transaction abort!
				rollback completed
				abort: received spurious file revlog entry
				[255]

				$ hg -q rollback
				$ mv tmp1 .hg/store/data/beta.i
				$ echo beta > beta

				Test missing filelog entries:

				$ cp .hg/store/data/beta.i tmp
				$ echo blah >> beta
				$ hg ci -m '2 (corrupt)'
				$ mv tmp .hg/store/data/beta.i

				Expected to fail:

				$ hg verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				beta@1: dddc47b3ba30 in manifests not found
				2 files, 2 changesets, 2 total revisions
				1 integrity errors encountered!
				(first damaged changeset appears to be 1)
				[1]

				$ hg push
				pushing to $TESTTMP/test (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				transaction abort!
				rollback completed
				abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
				[255]

				$ cd ..