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

r32225:73c3e226 default


                r32255:7e35d31b

default

Download file

             test-check-code.t
        
                    49 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-code.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pierre-Yves David
    
tests: move the '-hg' postfix for all style tests...

              r27368
            
      #require test-repo

        timeless
    
tests: silence test-repo obsolete warning...

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

        Pierre-Yves David
    
tests: move the '-hg' postfix for all style tests...

              r27368
            
        $ 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.)

        David Soria Parra
    
tests: exclude bundled pywatchman from check-code test...

              r30633
            
        $ hg locate -X contrib/python-zstandard -X hgext/fsmonitor/pywatchman |

        Jun Wu
    
test-check-code: do not use xargs...

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

        Pierre-Yves David
    
tests: move the '-hg' postfix for all style tests...

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

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

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

        Gregory Szorc
    
statprof: vendor statprof.py...

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

        Gregory Szorc
    
tests: add tests for poorly behaving HTTP server...

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

        Gregory Szorc
    
tests: add test that @commands in debugcommands.py are sorted...

              r30540
            
      @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

        Jun Wu
    
test-check-code: prevent files being added to the root directory...

              r31726
            
      Prevent adding new files in the root directory accidentally.

        $ hg files 'glob:*'

        .editorconfig

        .hgignore

        .hgsigs

        .hgtags

        CONTRIBUTING

        CONTRIBUTORS

        COPYING

        Makefile

        README

        hg

        hgeditor

        hgweb.cgi

        setup.py

	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

Pierre-Yves David tests: move the '-hg' postfix for all style tests...	r27368	#require test-repo

timeless tests: silence test-repo obsolete warning...	r29219	$ . "$TESTDIR/helpers-testrepo.sh"
Pierre-Yves David tests: move the '-hg' postfix for all style tests...	r27368	$ 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.)

David Soria Parra tests: exclude bundled pywatchman from check-code test...	r30633	$ hg locate -X contrib/python-zstandard -X hgext/fsmonitor/pywatchman \|
Jun Wu test-check-code: do not use xargs...	r31825	> sed 's-\\-/-g' \| "$check_code" --warnings --per-file=0 - \|\| false
Pierre-Yves David tests: move the '-hg' postfix for all style tests...	r27368	Skipping i18n/polib.py it has no-che?k-code (glob)
		Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
		Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
Gregory Szorc statprof: vendor statprof.py...	r30253	Skipping mercurial/statprof.py it has no-che?k-code (glob)
Gregory Szorc tests: add tests for poorly behaving HTTP server...	r32001	Skipping tests/badserverext.py it has no-che?k-code (glob)
Gregory Szorc tests: add test that @commands in debugcommands.py are sorted...	r30540
		@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
Jun Wu test-check-code: prevent files being added to the root directory...	r31726
		Prevent adding new files in the root directory accidentally.

		$ hg files 'glob:*'
		.editorconfig
		.hgignore
		.hgsigs
		.hgtags
		CONTRIBUTING
		CONTRIBUTORS
		COPYING
		Makefile
		README
		hg
		hgeditor
		hgweb.cgi
		setup.py