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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Maciej Fijalkowski - - Load All Authors

File last commit:

r28783:d9179856 default


                r32255:7e35d31b

default

Download file

             test-revlog.t
        
                    15 lines
            
             | 653 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revlog.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test for CVE-2016-3630

        $ hg init

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

        ... """eJxjYGZgZIAAYQYGxhgom+k/FMx8YKx9ZUaKSOyqo4cnuKb8mbqHV5cBCVTMWb1Cwqkhe4Gsg9AD

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

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

        $ hg debugindex a.i

           rev    offset  length  delta linkrev nodeid       p1           p2

             0         0      19     -1       2 99e0332bd498 000000000000 000000000000

             1        19      12      0       3 6674f57a23d8 99e0332bd498 000000000000

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

        (mercurial.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

				Test for CVE-2016-3630

				$ hg init

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

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