upstream/mercurial-mirror Files · tests/test-verify.t

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Patrick Mezard - - Load All Authors

File last commit:

r17385:b32a30da stable


                r23524:a1a7c94d

default

Download file

             test-verify.t
        
                    115 lines
            
             | 2.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-verify.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
      prepare repo

        $ hg init a

        $ cd a

        $ echo "some text" > FOO.txt

        $ echo "another text" > bar.txt

        $ echo "more text" > QUICK.txt

        $ hg add

        adding FOO.txt

        adding QUICK.txt

        adding bar.txt

        $ hg ci -mtest1

      verify

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        3 files, 1 changesets, 3 total revisions

      verify with journal

        $ touch .hg/store/journal

        $ hg verify

        abandoned transaction found - run hg recover

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        3 files, 1 changesets, 3 total revisions

        $ rm .hg/store/journal

      introduce some bugs in repo

        $ cd .hg/store/data

        $ mv _f_o_o.txt.i X_f_o_o.txt.i

        $ mv bar.txt.i xbar.txt.i

        $ rm _q_u_i_c_k.txt.i

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

         data/FOO.txt.i@0: missing revlog!

         0: empty or missing FOO.txt

         FOO.txt@0: f62022d3d590 in manifests not found

         data/QUICK.txt.i@0: missing revlog!

         0: empty or missing QUICK.txt

         QUICK.txt@0: 88b857db8eba in manifests not found

         data/bar.txt.i@0: missing revlog!

         0: empty or missing bar.txt

         bar.txt@0: 256559129457 in manifests not found

        3 files, 1 changesets, 0 total revisions

        9 integrity errors encountered!

        (first damaged changeset appears to be 0)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
        Mads Kiilerich
    
tests: cleanup of tests that got lost in their own nested directories...

              r16912
            
        $ cd ../../..

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
        $ cd ..

        Patrick Mezard
    
verify: do not choke on valid changelog without manifest...

              r17385
            
      test changelog without a manifest

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
        $ hg init b

        $ cd b

        Patrick Mezard
    
verify: do not choke on valid changelog without manifest...

              r17385
            
        $ hg branch foo

        marked working directory as branch foo

        (branches are permanent and global, did you want a bookmark?)

        $ hg ci -m branchfoo

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        0 files, 1 changesets, 0 total revisions

      test revlog corruption

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
        $ touch a

        $ hg add a

        $ hg ci -m a

        $ echo 'corrupted' > b

        $ dd if=.hg/store/data/a.i of=start bs=1 count=20 2>/dev/null

        $ cat start b > .hg/store/data/a.i

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        Patrick Mezard
    
verify: do not choke on valid changelog without manifest...

              r17385
            
         a@1: broken revlog! (index data/a.i is corrupted)

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
        warning: orphan revlog 'data/a.i'

        Patrick Mezard
    
verify: do not choke on valid changelog without manifest...

              r17385
            
        1 files, 2 changesets, 0 total revisions

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
        1 warnings encountered!

        1 integrity errors encountered!

        Patrick Mezard
    
verify: do not choke on valid changelog without manifest...

              r17385
            
        (first damaged changeset appears to be 1)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-verify

              r11787
            
        Thomas Arendsen Hein
    
merge with stable

              r12172
            
        $ cd ..

      test revlog format 0

        $ "$TESTDIR/revlog-formatv0.py"

        $ cd formatv0

        $ hg verify

        repository uses revlog format 0

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        Mads Kiilerich
    
tests: cleanup of tests that got lost in their own nested directories...

              r16912
            
        $ 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

Nicolas Dumazet tests: unify test-verify	r11787	prepare repo

		$ hg init a
		$ cd a
		$ echo "some text" > FOO.txt
		$ echo "another text" > bar.txt
		$ echo "more text" > QUICK.txt
		$ hg add
		adding FOO.txt
		adding QUICK.txt
		adding bar.txt
		$ hg ci -mtest1

		verify

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

		verify with journal

		$ touch .hg/store/journal
		$ hg verify
		abandoned transaction found - run hg recover
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		3 files, 1 changesets, 3 total revisions
		$ rm .hg/store/journal

		introduce some bugs in repo

		$ cd .hg/store/data
		$ mv _f_o_o.txt.i X_f_o_o.txt.i
		$ mv bar.txt.i xbar.txt.i
		$ rm _q_u_i_c_k.txt.i

		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		data/FOO.txt.i@0: missing revlog!
		0: empty or missing FOO.txt
		FOO.txt@0: f62022d3d590 in manifests not found
		data/QUICK.txt.i@0: missing revlog!
		0: empty or missing QUICK.txt
		QUICK.txt@0: 88b857db8eba in manifests not found
		data/bar.txt.i@0: missing revlog!
		0: empty or missing bar.txt
		bar.txt@0: 256559129457 in manifests not found
		3 files, 1 changesets, 0 total revisions
		9 integrity errors encountered!
		(first damaged changeset appears to be 0)
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-verify	r11787
Mads Kiilerich tests: cleanup of tests that got lost in their own nested directories...	r16912	$ cd ../../..
Nicolas Dumazet tests: unify test-verify	r11787	$ cd ..

Patrick Mezard verify: do not choke on valid changelog without manifest...	r17385	test changelog without a manifest
Nicolas Dumazet tests: unify test-verify	r11787
		$ hg init b
		$ cd b
Patrick Mezard verify: do not choke on valid changelog without manifest...	r17385	$ hg branch foo
		marked working directory as branch foo
		(branches are permanent and global, did you want a bookmark?)
		$ hg ci -m branchfoo
		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		0 files, 1 changesets, 0 total revisions

		test revlog corruption
Nicolas Dumazet tests: unify test-verify	r11787
		$ touch a
		$ hg add a
		$ hg ci -m a

		$ echo 'corrupted' > b
		$ dd if=.hg/store/data/a.i of=start bs=1 count=20 2>/dev/null
		$ cat start b > .hg/store/data/a.i

		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
Patrick Mezard verify: do not choke on valid changelog without manifest...	r17385	a@1: broken revlog! (index data/a.i is corrupted)
Nicolas Dumazet tests: unify test-verify	r11787	warning: orphan revlog 'data/a.i'
Patrick Mezard verify: do not choke on valid changelog without manifest...	r17385	1 files, 2 changesets, 0 total revisions
Nicolas Dumazet tests: unify test-verify	r11787	1 warnings encountered!
		1 integrity errors encountered!
Patrick Mezard verify: do not choke on valid changelog without manifest...	r17385	(first damaged changeset appears to be 1)
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-verify	r11787
Thomas Arendsen Hein merge with stable	r12172	$ cd ..

		test revlog format 0

		$ "$TESTDIR/revlog-formatv0.py"
		$ cd formatv0
		$ hg verify
		repository uses revlog format 0
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions
Mads Kiilerich tests: cleanup of tests that got lost in their own nested directories...	r16912	$ cd ..