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

Augie Fackler - - Load All Authors

File last commit:

r34469:bb14dbab stable


                r38817:bb54db4a

@96 default

Download file

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

        $ . "$TESTDIR/helpers-testrepo.sh"

      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

        $ ( \

        > testrepohgenv; \

        > $PYTHON $TESTDIR/run-tests.py $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t \

        > )

        .

        # Ran 1 tests, 0 skipped, 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

				$ . "$TESTDIR/helpers-testrepo.sh"

				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
				$ ( \
				> testrepohgenv; \
				> $PYTHON $TESTDIR/run-tests.py $HGTEST_RUN_TESTS_PURE test-hghaveaddon.t \
				> )
				.
				# Ran 1 tests, 0 skipped, 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]