upstream/mercurial-mirror Files · tests/test-revset-dirstate-parents.t

patch: don't separate \r and \n when colorizing diff output...

patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

Yuya Nishihara - - Load All Authors

File last commit:

r34075:7bbc4e11 default


                r38649:e1987261

default

Download file

             test-revset-dirstate-parents.t
        
                    66 lines
            
             | 880 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revset-dirstate-parents.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ HGENCODING=utf-8

        $ export HGENCODING

        $ try() {

        >   hg debugrevspec --debug $@

        > }

        $ log() {

        >   hg log --template '{rev}\n' -r "$1"

        > }

        $ hg init repo

        $ cd repo

        $ try 'p1()'

        (func

          (symbol 'p1')

          None)

        * set:

        <baseset []>

        $ try 'p2()'

        (func

          (symbol 'p2')

          None)

        * set:

        <baseset []>

        $ try 'parents()'

        (func

          (symbol 'parents')

          None)

        * set:

        <baseset+ []>

      null revision

        $ log 'p1()'

        $ log 'p2()'

        $ log 'parents()'

      working dir with a single parent

        $ echo a > a

        $ hg ci -Aqm0

        $ log 'p1()'

        0

        $ log 'tag() and p1()'

        $ log 'p2()'

        $ log 'parents()'

        0

        $ log 'tag() and parents()'

      merge in progress

        $ echo b > b

        $ hg ci -Aqm1

        $ hg up -q 0

        $ echo c > c

        $ hg ci -Aqm2

        $ hg merge -q

        $ log 'p1()'

        2

        $ log 'p2()'

        1

        $ log 'tag() and p2()'

        $ log 'parents()'

        1

        2

        $ cd ..

	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

				$ HGENCODING=utf-8
				$ export HGENCODING

				$ try() {
				> hg debugrevspec --debug $@
				> }

				$ log() {
				> hg log --template '{rev}\n' -r "$1"
				> }

				$ hg init repo
				$ cd repo

				$ try 'p1()'
				(func
				(symbol 'p1')
				None)
				* set:
				<baseset []>
				$ try 'p2()'
				(func
				(symbol 'p2')
				None)
				* set:
				<baseset []>
				$ try 'parents()'
				(func
				(symbol 'parents')
				None)
				* set:
				<baseset+ []>

				null revision
				$ log 'p1()'
				$ log 'p2()'
				$ log 'parents()'

				working dir with a single parent
				$ echo a > a
				$ hg ci -Aqm0
				$ log 'p1()'
				0
				$ log 'tag() and p1()'
				$ log 'p2()'
				$ log 'parents()'
				0
				$ log 'tag() and parents()'

				merge in progress
				$ echo b > b
				$ hg ci -Aqm1
				$ hg up -q 0
				$ echo c > c
				$ hg ci -Aqm2
				$ hg merge -q
				$ log 'p1()'
				2
				$ log 'p2()'
				1
				$ log 'tag() and p2()'
				$ log 'parents()'
				1
				2

				$ cd ..