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

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r38649:e1987261

default

Download file

             test-eol-clone.t
        
                    77 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eol-clone.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Testing cloning with the EOL extension

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > eol =

        > 

        > [eol]

        > native = CRLF

        > EOF

      setup repository

        $ hg init repo

        $ cd repo

        $ cat > .hgeol <<EOF

        > [patterns]

        > **.txt = native

        > EOF

        $ printf "first\r\nsecond\r\nthird\r\n" > a.txt

        $ hg commit --addremove -m 'checkin'

        adding .hgeol

        adding a.txt

      Clone

        $ cd ..

        $ hg clone repo repo-2

        updating to branch default

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

        $ cd repo-2

        $ cat a.txt

        first\r (esc)

        second\r (esc)

        third\r (esc)

        $ hg cat a.txt

        first

        second

        third

        $ hg remove .hgeol

        $ hg commit -m 'remove eol'

        $ hg push --quiet

        $ cd ..

      Test clone of repo with .hgeol in working dir, but no .hgeol in tip

        $ hg clone repo repo-3

        updating to branch default

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

        $ cd repo-3

        $ cat a.txt

        first

        second

        third

      Test clone of revision with .hgeol

        $ cd ..

        $ hg clone -r 0 repo repo-4

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 2 changes to 2 files

        new changesets 90f94e2cf4e2

        updating to branch default

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

        $ cd repo-4

        $ cat .hgeol

        [patterns]

        **.txt = native

        $ cat a.txt

        first\r (esc)

        second\r (esc)

        third\r (esc)

        $ 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

				Testing cloning with the EOL extension

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> eol =
				>
				> [eol]
				> native = CRLF
				> EOF

				setup repository

				$ hg init repo
				$ cd repo
				$ cat > .hgeol <<EOF
				> [patterns]
				> **.txt = native
				> EOF
				$ printf "first\r\nsecond\r\nthird\r\n" > a.txt
				$ hg commit --addremove -m 'checkin'
				adding .hgeol
				adding a.txt

				Clone

				$ cd ..
				$ hg clone repo repo-2
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd repo-2
				$ cat a.txt
				first\r (esc)
				second\r (esc)
				third\r (esc)
				$ hg cat a.txt
				first
				second
				third
				$ hg remove .hgeol
				$ hg commit -m 'remove eol'
				$ hg push --quiet
				$ cd ..

				Test clone of repo with .hgeol in working dir, but no .hgeol in tip

				$ hg clone repo repo-3
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd repo-3

				$ cat a.txt
				first
				second
				third

				Test clone of revision with .hgeol

				$ cd ..
				$ hg clone -r 0 repo repo-4
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 2 changes to 2 files
				new changesets 90f94e2cf4e2
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd repo-4
				$ cat .hgeol
				[patterns]
				**.txt = native

				$ cat a.txt
				first\r (esc)
				second\r (esc)
				third\r (esc)

				$ cd ..