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

Yuya Nishihara - - Load All Authors

File last commit:

r37822:1ec87471 4.6rc1 stable


                r38817:bb54db4a

@96 default

Download file

             test-check-code.t
        
                    65 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-code.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require test-repo

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

        $ check_code="$TESTDIR"/../contrib/check-code.py

        $ cd "$TESTDIR"/..

      New errors are not allowed. Warnings are strongly discouraged.

      (The writing "no-che?k-code" is for not skipping this file when checking.)

        $ testrepohg locate \

        > -X contrib/python-zstandard \

        > -X hgext/fsmonitor/pywatchman \

        > -X mercurial/thirdparty \

        > | sed 's-\\-/-g' | "$check_code" --warnings --per-file=0 - || false

        Skipping i18n/polib.py it has no-che?k-code (glob)

        Skipping mercurial/statprof.py it has no-che?k-code (glob)

        Skipping tests/badserverext.py it has no-che?k-code (glob)

      @commands in debugcommands.py should be in alphabetical order.

        >>> import re

        >>> commands = []

        >>> with open('mercurial/debugcommands.py', 'rb') as fh:

        ...     for line in fh:

        ...         m = re.match("^@command\('([a-z]+)", line)

        ...         if m:

        ...             commands.append(m.group(1))

        >>> scommands = list(sorted(commands))

        >>> for i, command in enumerate(scommands):

        ...     if command != commands[i]:

        ...         print('commands in debugcommands.py not sorted; first differing '

        ...               'command is %s; expected %s' % (commands[i], command))

        ...         break

      Prevent adding new files in the root directory accidentally.

        $ testrepohg files 'glob:*'

        .arcconfig

        .clang-format

        .editorconfig

        .hgignore

        .hgsigs

        .hgtags

        .jshintrc

        CONTRIBUTING

        CONTRIBUTORS

        COPYING

        Makefile

        README.rst

        hg

        hgeditor

        hgweb.cgi

        setup.py

      Prevent adding modules which could be shadowed by ancient .so/.dylib.

        $ testrepohg files \

        > mercurial/base85.py \

        > mercurial/bdiff.py \

        > mercurial/diffhelpers.py \

        > mercurial/mpatch.py \

        > mercurial/osutil.py \

        > mercurial/parsers.py \

        > mercurial/zstd.py

        [1]

	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

				#require test-repo

				$ . "$TESTDIR/helpers-testrepo.sh"
				$ check_code="$TESTDIR"/../contrib/check-code.py
				$ cd "$TESTDIR"/..

				New errors are not allowed. Warnings are strongly discouraged.
				(The writing "no-che?k-code" is for not skipping this file when checking.)

				$ testrepohg locate \
				> -X contrib/python-zstandard \
				> -X hgext/fsmonitor/pywatchman \
				> -X mercurial/thirdparty \
				> \| sed 's-\\-/-g' \| "$check_code" --warnings --per-file=0 - \|\| false
				Skipping i18n/polib.py it has no-che?k-code (glob)
				Skipping mercurial/statprof.py it has no-che?k-code (glob)
				Skipping tests/badserverext.py it has no-che?k-code (glob)

				@commands in debugcommands.py should be in alphabetical order.

				>>> import re
				>>> commands = []
				>>> with open('mercurial/debugcommands.py', 'rb') as fh:
				... for line in fh:
				... m = re.match("^@command\('([a-z]+)", line)
				... if m:
				... commands.append(m.group(1))
				>>> scommands = list(sorted(commands))
				>>> for i, command in enumerate(scommands):
				... if command != commands[i]:
				... print('commands in debugcommands.py not sorted; first differing '
				... 'command is %s; expected %s' % (commands[i], command))
				... break

				Prevent adding new files in the root directory accidentally.

				$ testrepohg files 'glob:*'
				.arcconfig
				.clang-format
				.editorconfig
				.hgignore
				.hgsigs
				.hgtags
				.jshintrc
				CONTRIBUTING
				CONTRIBUTORS
				COPYING
				Makefile
				README.rst
				hg
				hgeditor
				hgweb.cgi
				setup.py

				Prevent adding modules which could be shadowed by ancient .so/.dylib.

				$ testrepohg files \
				> mercurial/base85.py \
				> mercurial/bdiff.py \
				> mercurial/diffhelpers.py \
				> mercurial/mpatch.py \
				> mercurial/osutil.py \
				> mercurial/parsers.py \
				> mercurial/zstd.py
				[1]