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

r33199:ddd65b4f default


                r38817:bb54db4a

@96 default

Download file

             test-check-shbang.t
        
                    25 lines
            
             | 801 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-shbang.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require test-repo

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

        $ cd "`dirname "$TESTDIR"`"

      look for python scripts that do not use /usr/bin/env

        $ testrepohg files 'set:grep(r"^#!.*?python") and not grep(r"^#!/usr/bi{1}n/env python") - **/*.t'

        [1]

      In tests, enforce $PYTHON and *not* /usr/bin/env python or similar:

        $ testrepohg files 'set:grep(r"#!.*?python") and **/*.t' \

        > -X tests/test-check-execute.t \

        > -X tests/test-check-module-imports.t \

        > -X tests/test-check-pyflakes.t \

        > -X tests/test-check-shbang.t

        [1]

      The above exclusions are because they're looking for files that

      contain Python but don't end in .py - please avoid adding more.

      look for shell scripts that do not use /bin/sh

        $ testrepohg files 'set:grep(r"^#!.*/bi{1}n/sh") and not grep(r"^#!/bi{1}n/sh")'

        [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"
				$ cd "`dirname "$TESTDIR"`"

				look for python scripts that do not use /usr/bin/env

				$ testrepohg files 'set:grep(r"^#!.?python") and not grep(r"^#!/usr/bi{1}n/env python") - /.t'
				[1]

				In tests, enforce $PYTHON and not /usr/bin/env python or similar:
				$ testrepohg files 'set:grep(r"#!.?python") and /.t' \
				> -X tests/test-check-execute.t \
				> -X tests/test-check-module-imports.t \
				> -X tests/test-check-pyflakes.t \
				> -X tests/test-check-shbang.t
				[1]

				The above exclusions are because they're looking for files that
				contain Python but don't end in .py - please avoid adding more.

				look for shell scripts that do not use /bin/sh

				$ testrepohg files 'set:grep(r"^#!.*/bi{1}n/sh") and not grep(r"^#!/bi{1}n/sh")'
				[1]