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

Pierre-Yves David - - Load All Authors

File last commit:

r23402:2963d5c9 stable


                r38649:e1987261

default

Download file

             test-mq-qrename.t
        
                    125 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qrename.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init a

        $ cd a

        $ echo 'base' > base

        $ hg ci -Ambase

        adding base

        $ hg qnew -mmqbase mqbase

        $ hg qrename mqbase renamed

        $ mkdir .hg/patches/foo

        $ hg qrename renamed foo

        $ hg qseries

        foo/renamed

        $ ls .hg/patches/foo

        renamed

        $ mkdir .hg/patches/bar

        $ hg qrename foo/renamed bar

        $ hg qseries

        bar/renamed

        $ ls .hg/patches/bar

        renamed

        $ hg qrename bar/renamed baz

        $ hg qseries

        baz

        $ ls .hg/patches/baz

        .hg/patches/baz

        $ hg qrename baz new/dir

        $ hg qseries

        new/dir

        $ ls .hg/patches/new/dir

        .hg/patches/new/dir

        $ cd ..

      Test patch being renamed before committed:

        $ hg init b

        $ cd b

        $ hg qinit -c

        $ hg qnew x

        $ hg qrename y

        $ hg qcommit -m rename

        $ cd ..

      Test overlapping renames (issue2388)

        $ hg init c

        $ cd c

        $ hg qinit -c

        $ echo a > a

        $ hg add

        adding a

        $ hg qnew patcha

        $ echo b > b

        $ hg add

        adding b

        $ hg qnew patchb

        $ hg ci --mq -m c1

        $ hg qrename patchb patchc

        $ hg qrename patcha patchb

        $ hg st --mq

        M patchb

        M series

        A patchc

        R patcha

        $ cd ..

      Test renames with mq repo (issue2097)

        $ hg init issue2097

        $ cd issue2097

        $ hg qnew p0

        $ (cd .hg/patches && hg init)

        $ hg qren p0 p1

        $ hg debugstate --mq

        $ hg ci --mq -mq0

        nothing changed

        [1]

        $ cd ..

      Test renaming to a folded patch (issue3058)

        $ hg init issue3058

        $ cd issue3058

        $ hg init --mq

        $ echo a > a

        $ hg add a

        $ hg qnew adda

        $ echo b >> a

        $ hg qnew addb

        $ hg qpop

        popping addb

        now at: adda

        $ hg ci --mq -m "save mq"

        $ hg qfold addb

        $ hg qmv addb

        $ cat .hg/patches/addb

        # HG changeset patch

        # Parent  0000000000000000000000000000000000000000

        diff -r 000000000000 a

        --- /dev/null	* (glob)

        +++ b/a	* (glob)

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

        +a

        +b

        $ 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


				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init a
				$ cd a

				$ echo 'base' > base
				$ hg ci -Ambase
				adding base

				$ hg qnew -mmqbase mqbase

				$ hg qrename mqbase renamed
				$ mkdir .hg/patches/foo
				$ hg qrename renamed foo

				$ hg qseries
				foo/renamed

				$ ls .hg/patches/foo
				renamed

				$ mkdir .hg/patches/bar
				$ hg qrename foo/renamed bar

				$ hg qseries
				bar/renamed

				$ ls .hg/patches/bar
				renamed

				$ hg qrename bar/renamed baz

				$ hg qseries
				baz

				$ ls .hg/patches/baz
				.hg/patches/baz

				$ hg qrename baz new/dir

				$ hg qseries
				new/dir

				$ ls .hg/patches/new/dir
				.hg/patches/new/dir

				$ cd ..

				Test patch being renamed before committed:

				$ hg init b
				$ cd b
				$ hg qinit -c
				$ hg qnew x
				$ hg qrename y
				$ hg qcommit -m rename

				$ cd ..

				Test overlapping renames (issue2388)

				$ hg init c
				$ cd c
				$ hg qinit -c
				$ echo a > a
				$ hg add
				adding a
				$ hg qnew patcha
				$ echo b > b
				$ hg add
				adding b
				$ hg qnew patchb
				$ hg ci --mq -m c1
				$ hg qrename patchb patchc
				$ hg qrename patcha patchb
				$ hg st --mq
				M patchb
				M series
				A patchc
				R patcha
				$ cd ..

				Test renames with mq repo (issue2097)

				$ hg init issue2097
				$ cd issue2097
				$ hg qnew p0
				$ (cd .hg/patches && hg init)
				$ hg qren p0 p1
				$ hg debugstate --mq
				$ hg ci --mq -mq0
				nothing changed
				[1]
				$ cd ..

				Test renaming to a folded patch (issue3058)

				$ hg init issue3058
				$ cd issue3058
				$ hg init --mq
				$ echo a > a
				$ hg add a
				$ hg qnew adda
				$ echo b >> a
				$ hg qnew addb
				$ hg qpop
				popping addb
				now at: adda
				$ hg ci --mq -m "save mq"
				$ hg qfold addb
				$ hg qmv addb
				$ cat .hg/patches/addb
				# HG changeset patch
				# Parent 0000000000000000000000000000000000000000

				diff -r 000000000000 a
				--- /dev/null * (glob)
				+++ b/a * (glob)
				@@ -0,0 +1,2 @@
				+a
				+b
				$ cd ..