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

Matt Mackall - - Load All Authors

File last commit:

r12328:b63f6422 default


                r18006:0c10cf81

2.4.1 stable

Download file

             test-issue1438.t
        
                    23 lines
            
             | 400 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1438.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      http://mercurial.selenic.com/bts/issue1438

        Adrian Buehlmann
    
tests: unify test-issue1438 and test-issue2137

              r12204
            
        $ "$TESTDIR/hghave" symlink || exit 80

        $ hg init

        $ ln -s foo link

        $ hg add link

        $ hg ci -mbad link

        $ hg rm link

        $ hg ci -mok

        $ hg diff -g -r 0:1 > bad.patch

        $ hg up 0

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg import --no-commit bad.patch

        applying bad.patch

        $ hg status

        R link

        ? bad.patch

	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

Matt Mackall tests: fix a bunch of pointless #s in unified tests	r12328	http://mercurial.selenic.com/bts/issue1438
Adrian Buehlmann tests: unify test-issue1438 and test-issue2137	r12204
		$ "$TESTDIR/hghave" symlink \|\| exit 80

		$ hg init

		$ ln -s foo link
		$ hg add link
		$ hg ci -mbad link
		$ hg rm link
		$ hg ci -mok
		$ hg diff -g -r 0:1 > bad.patch

		$ hg up 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ hg import --no-commit bad.patch
		applying bad.patch

		$ hg status
		R link
		? bad.patch