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

r36582:c4ccc73f default


                r38649:e1987261

default

Download file

             test-issue2137.t
        
                    56 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue2137.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/2137

      Setup:

      create a little extension that has 3 side-effects:

      1) ensure changelog data is not inlined

      2) make revlog to use lazyparser

      3) test that repo.lookup() works

      1 and 2 are preconditions for the bug; 3 is the bug.

        $ cat > commitwrapper.py <<EOF

        > from mercurial import extensions, node, revlog

        > 

        > def reposetup(ui, repo):

        >     class wraprepo(repo.__class__):

        >         def commit(self, *args, **kwargs):

        >             result = super(wraprepo, self).commit(*args, **kwargs)

        >             tip1 = node.short(repo.changelog.tip())

        >             tip2 = node.short(repo.lookup(tip1))

        >             assert tip1 == tip2

        >             ui.write(b'new tip: %s\n' % tip1)

        >             return result

        >     repo.__class__ = wraprepo

        > 

        > def extsetup(ui):

        >     revlog._maxinline = 8             # split out 00changelog.d early

        >     revlog._prereadsize = 8           # use revlog.lazyparser

        > EOF

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > commitwrapper = `pwd`/commitwrapper.py

        > EOF

        $ hg init repo1

        $ cd repo1

        $ echo a > a

        $ hg commit -A -m'add a with a long commit message to make the changelog a bit bigger'

        adding a

        new tip: 553596fad57b

      Test that new changesets are visible to repo.lookup():

        $ echo a >> a

        $ hg commit -m'one more commit to demonstrate the bug'

        new tip: 799ae3599e0e

        $ hg tip

        changeset:   1:799ae3599e0e

        tag:         tip

        user:        test

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

        summary:     one more commit to demonstrate the bug

        $ 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

				https://bz.mercurial-scm.org/2137

				Setup:

				create a little extension that has 3 side-effects:
				1) ensure changelog data is not inlined
				2) make revlog to use lazyparser
				3) test that repo.lookup() works
				1 and 2 are preconditions for the bug; 3 is the bug.

				$ cat > commitwrapper.py <<EOF
				> from mercurial import extensions, node, revlog
				>
				> def reposetup(ui, repo):
				> class wraprepo(repo.__class__):
				> def commit(self, args, *kwargs):
				> result = super(wraprepo, self).commit(args, *kwargs)
				> tip1 = node.short(repo.changelog.tip())
				> tip2 = node.short(repo.lookup(tip1))
				> assert tip1 == tip2
				> ui.write(b'new tip: %s\n' % tip1)
				> return result
				> repo.__class__ = wraprepo
				>
				> def extsetup(ui):
				> revlog._maxinline = 8 # split out 00changelog.d early
				> revlog._prereadsize = 8 # use revlog.lazyparser
				> EOF

				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> commitwrapper = `pwd`/commitwrapper.py
				> EOF

				$ hg init repo1
				$ cd repo1
				$ echo a > a
				$ hg commit -A -m'add a with a long commit message to make the changelog a bit bigger'
				adding a
				new tip: 553596fad57b

				Test that new changesets are visible to repo.lookup():

				$ echo a >> a
				$ hg commit -m'one more commit to demonstrate the bug'
				new tip: 799ae3599e0e

				$ hg tip
				changeset: 1:799ae3599e0e
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: one more commit to demonstrate the bug


				$ cd ..