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

r32940:75be1499 default


                r38649:e1987261

default

Download file

             test-convert-bzr-ghosts.t
        
                    39 lines
            
             | 964 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-bzr-ghosts.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require bzr

        $ . "$TESTDIR/bzr-definitions"

        $ cat > ghostcreator.py <<EOF

        > import sys

        > from bzrlib import workingtree

        > wt = workingtree.WorkingTree.open('.')

        > 

        > message, ghostrev = sys.argv[1:]

        > wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])

        > wt.commit(message)

        > EOF

      ghost revisions

        $ mkdir test-ghost-revisions

        $ cd test-ghost-revisions

        $ bzr init -q source

        $ cd source

        $ echo content > somefile

        $ bzr add -q somefile

        $ bzr commit -q -m 'Initial layout setup'

        $ echo morecontent >> somefile

        $ $PYTHON ../../ghostcreator.py 'Commit with ghost revision' ghostrev

        $ cd ..

        $ hg convert source source-hg

        initializing destination source-hg repository

        scanning source...

        sorting...

        converting...

        1 Initial layout setup

        0 Commit with ghost revision

        $ glog -R source-hg

        o  1@source "Commit with ghost revision" files: somefile

        |

        o  0@source "Initial layout setup" files: somefile

        $ 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

				#require bzr

				$ . "$TESTDIR/bzr-definitions"
				$ cat > ghostcreator.py <<EOF
				> import sys
				> from bzrlib import workingtree
				> wt = workingtree.WorkingTree.open('.')
				>
				> message, ghostrev = sys.argv[1:]
				> wt.set_parent_ids(wt.get_parent_ids() + [ghostrev])
				> wt.commit(message)
				> EOF

				ghost revisions

				$ mkdir test-ghost-revisions
				$ cd test-ghost-revisions
				$ bzr init -q source
				$ cd source
				$ echo content > somefile
				$ bzr add -q somefile
				$ bzr commit -q -m 'Initial layout setup'
				$ echo morecontent >> somefile
				$ $PYTHON ../../ghostcreator.py 'Commit with ghost revision' ghostrev
				$ cd ..
				$ hg convert source source-hg
				initializing destination source-hg repository
				scanning source...
				sorting...
				converting...
				1 Initial layout setup
				0 Commit with ghost revision
				$ glog -R source-hg
				o 1@source "Commit with ghost revision" files: somefile
				\|
				o 0@source "Initial layout setup" files: somefile


				$ cd ..