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

Augie Fackler - - Load All Authors

File last commit:

r36101:dc014846 default


                r38649:e1987261

default

Download file

             test-narrow-patch.t
        
                    84 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-patch.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #testcases flat tree

        $ . "$TESTDIR/narrow-library.sh"

      #if tree

        $ cat << EOF >> $HGRCPATH

        > [experimental]

        > treemanifest = 1

        > EOF

      #endif

      create full repo

        $ hg init master

        $ cd master

        $ mkdir inside

        $ echo inside > inside/f1

        $ mkdir outside

        $ echo outside > outside/f1

        $ hg ci -Aqm 'initial'

        $ echo modified > inside/f1

        $ hg ci -qm 'modify inside'

        $ echo modified > outside/f1

        $ hg ci -qm 'modify outside'

        $ cd ..

        $ hg clone --narrow ssh://user@dummy/master narrow --include inside

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 2 changes to 1 files

        new changesets *:* (glob)

        updating to branch default

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

        $ cd narrow

      Can show patch touching paths outside

        $ hg log -p

        changeset:   2:* (glob)

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     modify outside

        changeset:   1:* (glob)

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     modify inside

        diff -r * -r * inside/f1 (glob)

        --- a/inside/f1	Thu Jan 01 00:00:00 1970 +0000

        +++ b/inside/f1	Thu Jan 01 00:00:00 1970 +0000

        @@ -1,1 +1,1 @@

        -inside

        +modified

        changeset:   0:* (glob)

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     initial

        diff -r 000000000000 -r * inside/f1 (glob)

        --- /dev/null	Thu Jan 01 00:00:00 1970 +0000

        +++ b/inside/f1	Thu Jan 01 00:00:00 1970 +0000

        @@ -0,0 +1,1 @@

        +inside

        $ hg status --rev 1 --rev 2

      Can show copies inside the narrow clone

        $ hg cp inside/f1 inside/f2

        $ hg diff --git

        diff --git a/inside/f1 b/inside/f2

        copy from inside/f1

        copy to inside/f2

	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

				#testcases flat tree

				$ . "$TESTDIR/narrow-library.sh"

				#if tree
				$ cat << EOF >> $HGRCPATH
				> [experimental]
				> treemanifest = 1
				> EOF
				#endif

				create full repo

				$ hg init master
				$ cd master

				$ mkdir inside
				$ echo inside > inside/f1
				$ mkdir outside
				$ echo outside > outside/f1
				$ hg ci -Aqm 'initial'

				$ echo modified > inside/f1
				$ hg ci -qm 'modify inside'

				$ echo modified > outside/f1
				$ hg ci -qm 'modify outside'

				$ cd ..

				$ hg clone --narrow ssh://user@dummy/master narrow --include inside
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 2 changes to 1 files
				new changesets : (glob)
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd narrow

				Can show patch touching paths outside

				$ hg log -p
				changeset: 2:* (glob)
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: modify outside


				changeset: 1:* (glob)
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: modify inside

				diff -r * -r * inside/f1 (glob)
				--- a/inside/f1 Thu Jan 01 00:00:00 1970 +0000
				+++ b/inside/f1 Thu Jan 01 00:00:00 1970 +0000
				@@ -1,1 +1,1 @@
				-inside
				+modified

				changeset: 0:* (glob)
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: initial

				diff -r 000000000000 -r * inside/f1 (glob)
				--- /dev/null Thu Jan 01 00:00:00 1970 +0000
				+++ b/inside/f1 Thu Jan 01 00:00:00 1970 +0000
				@@ -0,0 +1,1 @@
				+inside


				$ hg status --rev 1 --rev 2

				Can show copies inside the narrow clone

				$ hg cp inside/f1 inside/f2
				$ hg diff --git
				diff --git a/inside/f1 b/inside/f2
				copy from inside/f1
				copy to inside/f2