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

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Pulkit Goyal - - Load All Authors

File last commit:

r38091:0a10f142 default


                r38817:bb54db4a

@96 default

Download file

             test-revlog.t
        
                    47 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init empty-repo

        $ cd empty-repo

      Flags on revlog version 0 are rejected

        >>> with open('.hg/store/00changelog.i', 'wb') as fh:

        ...     fh.write(b'\x00\x01\x00\x00') and None

        $ hg log

        abort: unknown flags (0x01) in version 0 revlog 00changelog.i!

        [255]

      Unknown flags on revlog version 1 are rejected

        >>> with open('.hg/store/00changelog.i', 'wb') as fh:

        ...     fh.write(b'\x00\x04\x00\x01') and None

        $ hg log

        abort: unknown flags (0x04) in version 1 revlog 00changelog.i!

        [255]

      Unknown version is rejected

        >>> with open('.hg/store/00changelog.i', 'wb') as fh:

        ...     fh.write(b'\x00\x00\x00\x02') and None

        $ hg log

        abort: unknown version (2) in revlog 00changelog.i!

        [255]

        $ cd ..

      Test for CVE-2016-3630

        $ hg init

        >>> open("a.i", "wb").write(

        ... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD

        ... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA=="""

        ... .decode("base64").decode("zlib"))

        $ hg debugindex a.i

           rev linkrev nodeid       p1           p2

             0       2 99e0332bd498 000000000000 000000000000

             1       3 6674f57a23d8 99e0332bd498 000000000000

        $ hg debugdata a.i 1 2>&1 | egrep 'Error:.*decoded'

        (mercurial\.\w+\.mpatch\.)?mpatchError: patch cannot be decoded (re)

	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 empty-repo
				$ cd empty-repo

				Flags on revlog version 0 are rejected

				>>> with open('.hg/store/00changelog.i', 'wb') as fh:
				... fh.write(b'\x00\x01\x00\x00') and None

				$ hg log
				abort: unknown flags (0x01) in version 0 revlog 00changelog.i!
				[255]

				Unknown flags on revlog version 1 are rejected

				>>> with open('.hg/store/00changelog.i', 'wb') as fh:
				... fh.write(b'\x00\x04\x00\x01') and None

				$ hg log
				abort: unknown flags (0x04) in version 1 revlog 00changelog.i!
				[255]

				Unknown version is rejected

				>>> with open('.hg/store/00changelog.i', 'wb') as fh:
				... fh.write(b'\x00\x00\x00\x02') and None

				$ hg log
				abort: unknown version (2) in revlog 00changelog.i!
				[255]

				$ cd ..

				Test for CVE-2016-3630

				$ hg init

				>>> open("a.i", "wb").write(
				... b"""eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD
				... Joa3dYtcYYYBAQ8Qr4OqZAYRICPTSr5WKd/42rV36d+8/VmrNpv7NP1jQAXrQE4BqQUARngwVA=="""
				... .decode("base64").decode("zlib"))

				$ hg debugindex a.i
				rev linkrev nodeid p1 p2
				0 2 99e0332bd498 000000000000 000000000000
				1 3 6674f57a23d8 99e0332bd498 000000000000
				$ hg debugdata a.i 1 2>&1 \| egrep 'Error:.*decoded'
				(mercurial\.\w+\.mpatch\.)?mpatchError: patch cannot be decoded (re)