upstream/mercurial-mirror Files · tests/test-mq-qrename.t

subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API)...

subrepo: add argument to "diff()" to pass "ui" of caller side (issue3712) (API) Color extension achieves colorization by overriding the class of "ui" object just before command execution. Before this patch, "diff()" of abstractsubrepo and classes derived from it has no "ui" argument, so "diff()" of hgsubrepo uses "self._repo.ui" to invoke "cmdutil.diffordiffstat()". For separation of configuration between repositories, revision changed the initialization source of "self._repo.ui" from "ui"(overridden) to "baseui"(plain) of parent repository. And this caused break of colorization. This patch adds "ui" argument to "diff()" of abstractsubrepo and classes derived from it to pass "ui" object of caller side.

Patrick Mezard - - Load All Authors

File last commit:

r15322:c8e2a5ea stable


                r18006:0c10cf81

2.4.1 stable

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 series

        A patchb

        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 series
				A patchb
				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 ..