upstream/mercurial-mirror Files · tests/test-unified-test.t

merge: don't report progress for dr/rd actions...

merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

Yuya Nishihara - - Load All Authors

File last commit:

r22565:8d45a42b default


                r23524:a1a7c94d

default

Download file

             test-unified-test.t
        
                    133 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-unified-test.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test that the syntax of "unified tests" is properly processed

      ==============================================================

      Simple commands:

        $ echo foo

        foo

        $ printf 'oh no'

        oh no (no-eol)

        $ printf 'bar\nbaz\n' | cat

        bar

        baz

      Multi-line command:

        $ foo() {

        >     echo bar

        > }

        $ foo

        bar

      Return codes before inline python:

        $ sh -c 'exit 1'

        [1]

      Doctest commands:

        >>> print 'foo'

        foo

        $ echo interleaved

        interleaved

        >>> for c in 'xyz':

        ...     print c

        x

        y

        z

        >>> print

        >>> foo = 'global name'

        >>> def func():

        ...     print foo, 'should be visible in func()'

        >>> func()

        global name should be visible in func()

        >>> print '''multiline

        ... string'''

        multiline

        string

      Regular expressions:

        $ echo foobarbaz

        foobar.* (re)

        $ echo barbazquux

        .*quux.* (re)

      Globs:

        $ printf '* \\foobarbaz {10}\n'

        \* \\fo?bar* {10} (glob)

      Literal match ending in " (re)":

        $ echo 'foo (re)'

        foo (re)

      Windows: \r\n is handled like \n and can be escaped:

      #if windows

        $ printf 'crlf\r\ncr\r\tcrlf\r\ncrlf\r\n'

        crlf

        cr\r (no-eol) (esc)

        \tcrlf (esc)

        crlf\r (esc)

      #endif

      Combining esc with other markups - and handling lines ending with \r instead of \n:

        $ printf 'foo/bar\r'

        fo?/bar\r (no-eol) (glob) (esc)

      #if windows

        $ printf 'foo\\bar\r'

        foo/bar\r (no-eol) (glob) (esc)

      #endif

        $ printf 'foo/bar\rfoo/bar\r'

        foo.bar\r \(no-eol\) (re) (esc)

        foo.bar\r \(no-eol\) (re)

      testing hghave

        $ "$TESTDIR/hghave" true

        $ "$TESTDIR/hghave" false

        skipped: missing feature: nail clipper

        [1]

        $ "$TESTDIR/hghave" no-true

        skipped: system supports yak shaving

        [1]

        $ "$TESTDIR/hghave" no-false

      Conditional sections based on hghave:

      #if true

        $ echo tested

        tested

      #else

        $ echo skipped

      #endif

      #if false

        $ echo skipped

      #else

        $ echo tested

        tested

      #endif

      #if no-false

        $ echo tested

        tested

      #else

        $ echo skipped

      #endif

      #if no-true

        $ echo skipped

      #else

        $ echo tested

        tested

      #endif

      Exit code:

        $ (exit 1)

        [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

				Test that the syntax of "unified tests" is properly processed
				==============================================================

				Simple commands:

				$ echo foo
				foo
				$ printf 'oh no'
				oh no (no-eol)
				$ printf 'bar\nbaz\n' \| cat
				bar
				baz

				Multi-line command:

				$ foo() {
				> echo bar
				> }
				$ foo
				bar

				Return codes before inline python:

				$ sh -c 'exit 1'
				[1]

				Doctest commands:

				>>> print 'foo'
				foo
				$ echo interleaved
				interleaved
				>>> for c in 'xyz':
				... print c
				x
				y
				z
				>>> print

				>>> foo = 'global name'
				>>> def func():
				... print foo, 'should be visible in func()'
				>>> func()
				global name should be visible in func()
				>>> print '''multiline
				... string'''
				multiline
				string

				Regular expressions:

				$ echo foobarbaz
				foobar.* (re)
				$ echo barbazquux
				.quux. (re)

				Globs:

				$ printf '* \\foobarbaz {10}\n'
				\* \\fo?bar* {10} (glob)

				Literal match ending in " (re)":

				$ echo 'foo (re)'
				foo (re)

				Windows: \r\n is handled like \n and can be escaped:

				#if windows
				$ printf 'crlf\r\ncr\r\tcrlf\r\ncrlf\r\n'
				crlf
				cr\r (no-eol) (esc)
				\tcrlf (esc)
				crlf\r (esc)
				#endif

				Combining esc with other markups - and handling lines ending with \r instead of \n:

				$ printf 'foo/bar\r'
				fo?/bar\r (no-eol) (glob) (esc)
				#if windows
				$ printf 'foo\\bar\r'
				foo/bar\r (no-eol) (glob) (esc)
				#endif
				$ printf 'foo/bar\rfoo/bar\r'
				foo.bar\r \(no-eol\) (re) (esc)
				foo.bar\r \(no-eol\) (re)

				testing hghave

				$ "$TESTDIR/hghave" true
				$ "$TESTDIR/hghave" false
				skipped: missing feature: nail clipper
				[1]
				$ "$TESTDIR/hghave" no-true
				skipped: system supports yak shaving
				[1]
				$ "$TESTDIR/hghave" no-false

				Conditional sections based on hghave:

				#if true
				$ echo tested
				tested
				#else
				$ echo skipped
				#endif

				#if false
				$ echo skipped
				#else
				$ echo tested
				tested
				#endif

				#if no-false
				$ echo tested
				tested
				#else
				$ echo skipped
				#endif

				#if no-true
				$ echo skipped
				#else
				$ echo tested
				tested
				#endif

				Exit code:

				$ (exit 1)
				[1]