upstream/mercurial-mirror Files · tests/test-repo-compengines.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.

Gregory Szorc - - Load All Authors

File last commit:

r30818:4c0a5a25 default


                r32255:7e35d31b

default

Download file

             test-repo-compengines.t
        
                    78 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-repo-compengines.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      A new repository uses zlib storage, which doesn't need a requirement

        $ hg init default

        $ cd default

        $ cat .hg/requires

        dotencode

        fncache

        generaldelta

        revlogv1

        store

        $ touch foo

        $ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text to trigger compression'

        $ hg debugrevlog -c | grep 0x78

            0x78 (x)  :   1 (100.00%)

            0x78 (x)  : 110 (100.00%)

        $ cd ..

      Unknown compression engine to format.compression aborts

        $ hg --config experimental.format.compression=unknown init unknown

        abort: compression engine unknown defined by experimental.format.compression not available

        (run "hg debuginstall" to list available compression engines)

        [255]

      A requirement specifying an unknown compression engine results in bail

        $ hg init unknownrequirement

        $ cd unknownrequirement

        $ echo exp-compression-unknown >> .hg/requires

        $ hg log

        abort: repository requires features unknown to this Mercurial: exp-compression-unknown!

        (see https://mercurial-scm.org/wiki/MissingRequirement for more information)

        [255]

        $ cd ..

      #if zstd

        $ hg --config experimental.format.compression=zstd init zstd

        $ cd zstd

        $ cat .hg/requires

        dotencode

        exp-compression-zstd

        fncache

        generaldelta

        revlogv1

        store

        $ touch foo

        $ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text'

        $ hg debugrevlog -c | grep 0x28

            0x28      :  1 (100.00%)

            0x28      : 98 (100.00%)

        $ cd ..

      Specifying a new format.compression on an existing repo won't introduce data

      with that engine or a requirement

        $ cd default

        $ touch bar

        $ hg --config experimental.format.compression=zstd -q commit -A -m 'add bar with a lot of repeated repeated repeated text'

        $ cat .hg/requires

        dotencode

        fncache

        generaldelta

        revlogv1

        store

        $ hg debugrevlog -c | grep 0x78

            0x78 (x)  :   2 (100.00%)

            0x78 (x)  : 199 (100.00%)

      #endif

	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

				A new repository uses zlib storage, which doesn't need a requirement

				$ hg init default
				$ cd default
				$ cat .hg/requires
				dotencode
				fncache
				generaldelta
				revlogv1
				store

				$ touch foo
				$ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text to trigger compression'
				$ hg debugrevlog -c \| grep 0x78
				0x78 (x) : 1 (100.00%)
				0x78 (x) : 110 (100.00%)

				$ cd ..

				Unknown compression engine to format.compression aborts

				$ hg --config experimental.format.compression=unknown init unknown
				abort: compression engine unknown defined by experimental.format.compression not available
				(run "hg debuginstall" to list available compression engines)
				[255]

				A requirement specifying an unknown compression engine results in bail

				$ hg init unknownrequirement
				$ cd unknownrequirement
				$ echo exp-compression-unknown >> .hg/requires
				$ hg log
				abort: repository requires features unknown to this Mercurial: exp-compression-unknown!
				(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
				[255]

				$ cd ..

				#if zstd

				$ hg --config experimental.format.compression=zstd init zstd
				$ cd zstd
				$ cat .hg/requires
				dotencode
				exp-compression-zstd
				fncache
				generaldelta
				revlogv1
				store

				$ touch foo
				$ hg -q commit -A -m 'initial commit with a lot of repeated repeated repeated text'

				$ hg debugrevlog -c \| grep 0x28
				0x28 : 1 (100.00%)
				0x28 : 98 (100.00%)

				$ cd ..

				Specifying a new format.compression on an existing repo won't introduce data
				with that engine or a requirement

				$ cd default
				$ touch bar
				$ hg --config experimental.format.compression=zstd -q commit -A -m 'add bar with a lot of repeated repeated repeated text'

				$ cat .hg/requires
				dotencode
				fncache
				generaldelta
				revlogv1
				store

				$ hg debugrevlog -c \| grep 0x78
				0x78 (x) : 2 (100.00%)
				0x78 (x) : 199 (100.00%)

				#endif