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

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r38649:e1987261

default

Download file

             test-update-issue1456.t
        
                    45 lines
            
             | 858 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-issue1456.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require execbit

        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo foo > foo

        $ hg ci -qAm0

        $ echo toremove > toremove

        $ echo todelete > todelete

        $ chmod +x foo toremove todelete

        $ hg ci -qAm1

      Test that local removed/deleted, remote removed works with flags

        $ hg rm toremove

        $ rm todelete

        $ hg co -q 0

        $ echo dirty > foo

        $ hg up -c

        abort: uncommitted changes

        [255]

        $ hg up -q

        $ cat foo

        dirty

        $ hg st -A

        M foo

        C todelete

        C toremove

      Validate update of standalone execute bit change:

        $ hg up -C 0

        1 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ chmod -x foo

        $ hg ci -m removeexec

        nothing changed

        [1]

        $ hg up -C 0

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg up

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg st

        $ 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

				#require execbit

				$ rm -rf a
				$ hg init a
				$ cd a

				$ echo foo > foo
				$ hg ci -qAm0
				$ echo toremove > toremove
				$ echo todelete > todelete
				$ chmod +x foo toremove todelete
				$ hg ci -qAm1

				Test that local removed/deleted, remote removed works with flags
				$ hg rm toremove
				$ rm todelete
				$ hg co -q 0

				$ echo dirty > foo
				$ hg up -c
				abort: uncommitted changes
				[255]
				$ hg up -q
				$ cat foo
				dirty
				$ hg st -A
				M foo
				C todelete
				C toremove

				Validate update of standalone execute bit change:

				$ hg up -C 0
				1 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ chmod -x foo
				$ hg ci -m removeexec
				nothing changed
				[1]
				$ hg up -C 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg up
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st

				$ cd ..