upstream/mercurial-mirror Files · tests/test-merge-revert.t

repoview: fix corrupted hiddencache crash Mercurial (issue5042)...

repoview: fix corrupted hiddencache crash Mercurial (issue5042) Before this patch if the hiddencache existed but was empty, it would crash mercurial. This patch adds exception handling when reading the hiddencache to avoid the issue. When encountering a corrupted cache file we print a devel warning. There would be no point in issuing a normal warning as the user wouldn't be able to do anything about the situation. The warning looks like: devel-warn: corrupted hidden cache, removing it at: /path/to/repoview.py

Adrian Buehlmann - - Load All Authors

File last commit:

r12279:28e2e380 default


                r27917:97e0dc6d

stable

Download file

             test-merge-revert.t
        
                    74 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-revert.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo "added file1" > file1

        $ echo "added file2" > file2

        $ hg add file1 file2

        $ hg commit -m "added file1 and file2"

        $ echo "changed file1" >> file1

        $ hg commit -m "changed file1"

        $ hg -q log

        1:08a16e8e4408

        0:d29c767a4b52

        $ hg id

        08a16e8e4408 tip

        $ hg update -C 0

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

        $ hg id

        d29c767a4b52

        $ echo "changed file1" >> file1

        $ hg id

        d29c767a4b52+

        $ hg revert --all

        reverting file1

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        d29c767a4b52

        $ hg update

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg update -C 0

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

        $ echo "changed file1" >> file1

        $ hg update

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg revert --all

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg revert -r tip --all

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

        $ hg update -C

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        08a16e8e4408 tip

	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

				$ echo "added file1" > file1
				$ echo "added file2" > file2
				$ hg add file1 file2
				$ hg commit -m "added file1 and file2"

				$ echo "changed file1" >> file1
				$ hg commit -m "changed file1"

				$ hg -q log
				1:08a16e8e4408
				0:d29c767a4b52
				$ hg id
				08a16e8e4408 tip

				$ hg update -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg id
				d29c767a4b52
				$ echo "changed file1" >> file1
				$ hg id
				d29c767a4b52+

				$ hg revert --all
				reverting file1
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				d29c767a4b52

				$ hg update
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				08a16e8e4408 tip

				$ hg update -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo "changed file1" >> file1

				$ hg update
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				08a16e8e4408 tip

				$ hg revert --all
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				08a16e8e4408 tip

				$ hg revert -r tip --all
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				08a16e8e4408 tip

				$ hg update -C
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg diff
				$ hg status
				? file1.orig
				$ hg id
				08a16e8e4408 tip