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

timeless@mozdev.org - - Load All Authors

File last commit:

r26158:342ab95a default


                r32255:7e35d31b

default

Download file

             test-hghave.t
        
                    39 lines
            
             | 893 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-hghave.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing that hghave does not crash when checking features

        $ hghave --test-features 2>/dev/null

      Testing hghave extensibility for third party tools

        $ cat > hghaveaddon.py <<EOF

        > import hghave

        > @hghave.check("custom", "custom hghave feature")

        > def has_custom():

        >     return True

        > EOF

      (invocation via run-tests.py)

        $ cat > test-hghaveaddon.t <<EOF

        > #require custom

        >   $ echo foo

        >   foo

        > EOF

        $ run-tests.py $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t

        .

        # Ran 1 tests, 0 skipped, 0 warned, 0 failed.

      (invocation via command line)

        $ unset TESTDIR

        $ hghave custom

      (terminate with exit code 2 at failure of importing hghaveaddon.py)

        $ rm hghaveaddon.*

        $ cat > hghaveaddon.py <<EOF

        > importing this file should cause syntax error

        > EOF

        $ hghave custom

        failed to import hghaveaddon.py from '.': invalid syntax (hghaveaddon.py, line 1)

        [2]

	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

				Testing that hghave does not crash when checking features

				$ hghave --test-features 2>/dev/null

				Testing hghave extensibility for third party tools

				$ cat > hghaveaddon.py <<EOF
				> import hghave
				> @hghave.check("custom", "custom hghave feature")
				> def has_custom():
				> return True
				> EOF

				(invocation via run-tests.py)

				$ cat > test-hghaveaddon.t <<EOF
				> #require custom
				> $ echo foo
				> foo
				> EOF
				$ run-tests.py $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t
				.
				# Ran 1 tests, 0 skipped, 0 warned, 0 failed.

				(invocation via command line)

				$ unset TESTDIR
				$ hghave custom

				(terminate with exit code 2 at failure of importing hghaveaddon.py)

				$ rm hghaveaddon.*
				$ cat > hghaveaddon.py <<EOF
				> importing this file should cause syntax error
				> EOF

				$ hghave custom
				failed to import hghaveaddon.py from '.': invalid syntax (hghaveaddon.py, line 1)
				[2]