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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r38649:e1987261

default

Download file

             test-import-unknown.t
        
                    69 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-import-unknown.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > purge =

        > EOF

        $ hg init test

        $ cd test

        $ echo a > changed

        $ echo a > removed

        $ echo a > source

        $ hg ci -Am addfiles

        adding changed

        adding removed

        adding source

        $ echo a >> changed

        $ echo a > added

        $ hg add added

        $ hg rm removed

        $ hg cp source copied

        $ hg diff --git > ../unknown.diff

      Test adding on top of an unknown file

        $ hg up -qC 0

        $ hg purge

        $ echo a > added

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        file added already exists

        1 out of 1 hunks FAILED -- saving rejects to file added.rej

        abort: patch failed to apply

        [255]

      Test modifying an unknown file

        $ hg revert -aq

        $ hg purge

        $ hg rm changed

        $ hg ci -m removechanged

        $ echo a > changed

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot patch changed: file is not tracked

        [255]

      Test removing an unknown file

        $ hg up -qC 0

        $ hg purge

        $ hg rm removed

        $ hg ci -m removeremoved

        created new head

        $ echo a > removed

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot patch removed: file is not tracked

        [255]

      Test copying onto an unknown file

        $ hg up -qC 0

        $ hg purge

        $ echo a > copied

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot create copied: destination already exists

        [255]

        $ 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

				$ cat <<EOF >> $HGRCPATH
				> [extensions]
				> purge =
				> EOF

				$ hg init test
				$ cd test
				$ echo a > changed
				$ echo a > removed
				$ echo a > source
				$ hg ci -Am addfiles
				adding changed
				adding removed
				adding source
				$ echo a >> changed
				$ echo a > added
				$ hg add added
				$ hg rm removed
				$ hg cp source copied
				$ hg diff --git > ../unknown.diff

				Test adding on top of an unknown file

				$ hg up -qC 0
				$ hg purge
				$ echo a > added
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				file added already exists
				1 out of 1 hunks FAILED -- saving rejects to file added.rej
				abort: patch failed to apply
				[255]

				Test modifying an unknown file

				$ hg revert -aq
				$ hg purge
				$ hg rm changed
				$ hg ci -m removechanged
				$ echo a > changed
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				abort: cannot patch changed: file is not tracked
				[255]

				Test removing an unknown file

				$ hg up -qC 0
				$ hg purge
				$ hg rm removed
				$ hg ci -m removeremoved
				created new head
				$ echo a > removed
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				abort: cannot patch removed: file is not tracked
				[255]

				Test copying onto an unknown file

				$ hg up -qC 0
				$ hg purge
				$ echo a > copied
				$ hg import --no-commit ../unknown.diff
				applying ../unknown.diff
				abort: cannot create copied: destination already exists
				[255]

				$ cd ..