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

Martin Geisler - - Load All Authors

File last commit:

r16940:6409a5c7 default


                r18006:0c10cf81

2.4.1 stable

Download file

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

        $ unset HGUSER

        $ EMAIL="My Name <myname@example.com>"

        $ export EMAIL

        $ hg init test

        $ cd test

        $ touch asdf

        $ hg add asdf

        $ hg commit -m commit-1

        $ hg tip

        changeset:   0:53f268a58230

        tag:         tip

        user:        My Name <myname@example.com>

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

        summary:     commit-1

        $ unset EMAIL

        $ echo 1234 > asdf

        $ hg commit -u "foo@bar.com" -m commit-1

        $ hg tip

        changeset:   1:3871b2a9e9bf

        tag:         tip

        user:        foo@bar.com

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

        summary:     commit-1

        $ echo "[ui]" >> .hg/hgrc

        $ echo "username = foobar <foo@bar.com>" >> .hg/hgrc

        $ echo 12 > asdf

        $ hg commit -m commit-1

        $ hg tip

        changeset:   2:8eeac6695c1c

        tag:         tip

        user:        foobar <foo@bar.com>

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

        summary:     commit-1

        $ echo 1 > asdf

        $ hg commit -u "foo@bar.com" -m commit-1

        $ hg tip

        changeset:   3:957606a725e4

        tag:         tip

        user:        foo@bar.com

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

        summary:     commit-1

        $ echo 123 > asdf

        $ echo "[ui]" > .hg/hgrc

        $ echo "username = " >> .hg/hgrc

        $ hg commit -m commit-1

        abort: no username supplied (see "hg help config")

        [255]

        $ rm .hg/hgrc

        $ hg commit -m commit-1 2>&1

        no username found, using '[^']*' instead (re)

        $ echo space > asdf

        $ hg commit -u ' ' -m commit-1

        transaction abort!

        rollback completed

        abort: empty username!

        [255]

        $ 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

				$ unset HGUSER
				$ EMAIL="My Name <myname@example.com>"
				$ export EMAIL

				$ hg init test
				$ cd test
				$ touch asdf
				$ hg add asdf
				$ hg commit -m commit-1
				$ hg tip
				changeset: 0:53f268a58230
				tag: tip
				user: My Name <myname@example.com>
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1


				$ unset EMAIL
				$ echo 1234 > asdf
				$ hg commit -u "foo@bar.com" -m commit-1
				$ hg tip
				changeset: 1:3871b2a9e9bf
				tag: tip
				user: foo@bar.com
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1

				$ echo "[ui]" >> .hg/hgrc
				$ echo "username = foobar <foo@bar.com>" >> .hg/hgrc
				$ echo 12 > asdf
				$ hg commit -m commit-1
				$ hg tip
				changeset: 2:8eeac6695c1c
				tag: tip
				user: foobar <foo@bar.com>
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1

				$ echo 1 > asdf
				$ hg commit -u "foo@bar.com" -m commit-1
				$ hg tip
				changeset: 3:957606a725e4
				tag: tip
				user: foo@bar.com
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: commit-1

				$ echo 123 > asdf
				$ echo "[ui]" > .hg/hgrc
				$ echo "username = " >> .hg/hgrc
				$ hg commit -m commit-1
				abort: no username supplied (see "hg help config")
				[255]
				$ rm .hg/hgrc
				$ hg commit -m commit-1 2>&1
				no username found, using '[^']*' instead (re)

				$ echo space > asdf
				$ hg commit -u ' ' -m commit-1
				transaction abort!
				rollback completed
				abort: empty username!
				[255]

				$ cd ..