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

Pulkit Goyal - - Load All Authors

File last commit:

r36040:adec6374 default


                r38649:e1987261

default

Download file

             test-mactext.t
        
                    38 lines
            
             | 1.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mactext.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        $ cat > unix2mac.py <<EOF

        > import sys

        > 

        > for path in sys.argv[1:]:

        Pulkit Goyal
    
py3: replace file() with open() in test-mactext.t...

              r36040
            
        >     data = open(path, 'rb').read()

        >     data = data.replace(b'\n', b'\r')

        >     open(path, 'wb').write(data)

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        > EOF

        $ cat > print.py <<EOF

        > import sys

        > print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))

        > EOF

        $ hg init

        $ echo '[hooks]' >> .hg/hgrc

        $ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc

        $ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc

        $ cat .hg/hgrc

        [hooks]

        pretxncommit.cr = python:hgext.win32text.forbidcr

        pretxnchangegroup.cr = python:hgext.win32text.forbidcr

        Mads Kiilerich
    
tests: cleanup of echo statements left over from test conversion

              r15243
            
        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        $ echo hello > f

        $ hg add f

        $ hg ci -m 1

        Mads Kiilerich
    
tests: cleanup of echo statements left over from test conversion

              r15243
            
        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

              r32940
            
        $ $PYTHON unix2mac.py f

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        $ hg ci -m 2

        Martin Geisler
    
win32text: lowercase warning message

              r16932
            
        attempt to commit or push text file(s) using CR line endings

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        in dea860dc51ec: f

        transaction abort!

        rollback completed

        abort: pretxncommit.cr hook failed

        [255]

        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

              r32940
            
        $ hg cat f | $PYTHON print.py

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        hello<LF>

        Augie Fackler
    
cleanup: use $PYTHON to run python in many more tests...

              r32940
            
        $ cat f | $PYTHON print.py

        Matt Mackall
    
tests: unify test-mactext

              r12458
            
        hello<CR>

	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

Matt Mackall tests: unify test-mactext	r12458
		$ cat > unix2mac.py <<EOF
		> import sys
		>
		> for path in sys.argv[1:]:
Pulkit Goyal py3: replace file() with open() in test-mactext.t...	r36040	> data = open(path, 'rb').read()
		> data = data.replace(b'\n', b'\r')
		> open(path, 'wb').write(data)
Matt Mackall tests: unify test-mactext	r12458	> EOF
		$ cat > print.py <<EOF
		> import sys
		> print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
		> EOF
		$ hg init
		$ echo '[hooks]' >> .hg/hgrc
		$ echo 'pretxncommit.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
		$ echo 'pretxnchangegroup.cr = python:hgext.win32text.forbidcr' >> .hg/hgrc
		$ cat .hg/hgrc
		[hooks]
		pretxncommit.cr = python:hgext.win32text.forbidcr
		pretxnchangegroup.cr = python:hgext.win32text.forbidcr
Mads Kiilerich tests: cleanup of echo statements left over from test conversion	r15243
Matt Mackall tests: unify test-mactext	r12458	$ echo hello > f
		$ hg add f
		$ hg ci -m 1
Mads Kiilerich tests: cleanup of echo statements left over from test conversion	r15243
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ $PYTHON unix2mac.py f
Matt Mackall tests: unify test-mactext	r12458	$ hg ci -m 2
Martin Geisler win32text: lowercase warning message	r16932	attempt to commit or push text file(s) using CR line endings
Matt Mackall tests: unify test-mactext	r12458	in dea860dc51ec: f
		transaction abort!
		rollback completed
		abort: pretxncommit.cr hook failed
		[255]
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ hg cat f \| $PYTHON print.py
Matt Mackall tests: unify test-mactext	r12458	hello<LF>
Augie Fackler cleanup: use $PYTHON to run python in many more tests...	r32940	$ cat f \| $PYTHON print.py
Matt Mackall tests: unify test-mactext	r12458	hello<CR>