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

r36096:a2a6e724 default


                r38649:e1987261

default

Download file

             test-narrow-debugrebuilddirstate.t
        
                    31 lines
            
             | 903 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-narrow-debugrebuilddirstate.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

        $ hg init master

        $ cd master

        $ echo treemanifest >> .hg/requires

        $ echo 'contents of file' > file

        $ mkdir foo

        $ echo 'contents of foo/bar' > foo/bar

        $ hg ci -Am 'some change'

        adding file

        adding foo/bar

        $ cd ..

        $ hg clone --narrow ssh://user@dummy/master copy --include=foo

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        new changesets * (glob)

        updating to branch default

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

        $ cd copy

        $ hg debugdirstate

        n *         20 unset               foo/bar (glob)

        $ mv .hg/dirstate .hg/old_dirstate

        $ dd bs=40 count=1 if=.hg/old_dirstate of=.hg/dirstate 2>/dev/null

        $ hg debugdirstate

        $ hg debugrebuilddirstate

        $ hg debugdirstate

        n *         * unset               foo/bar (glob)

	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

				$ . "$TESTDIR/narrow-library.sh"
				$ hg init master
				$ cd master
				$ echo treemanifest >> .hg/requires
				$ echo 'contents of file' > file
				$ mkdir foo
				$ echo 'contents of foo/bar' > foo/bar
				$ hg ci -Am 'some change'
				adding file
				adding foo/bar

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

				$ hg debugdirstate
				n * 20 unset foo/bar (glob)
				$ mv .hg/dirstate .hg/old_dirstate
				$ dd bs=40 count=1 if=.hg/old_dirstate of=.hg/dirstate 2>/dev/null
				$ hg debugdirstate
				$ hg debugrebuilddirstate
				$ hg debugdirstate
				n * * unset foo/bar (glob)