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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r18006:0c10cf81

2.4.1 stable

Download file

             test-update-issue1456.t
        
                    36 lines
            
             | 682 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-issue1456.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ "$TESTDIR/hghave" execbit || exit 80

        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo foo > foo

        $ hg ci -qAm0

        $ chmod +x foo

        $ hg ci -m1

        $ hg co -q 0

        $ echo dirty > foo

        $ hg up -c

        abort: uncommitted local changes

        [255]

        $ hg up -q

        $ cat foo

        dirty

        $ hg st -A

        M foo

      Validate update of standalone execute bit change:

        $ hg up -C 0

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

        $ chmod -x foo

        $ hg ci -m removeexec

        nothing changed

        [1]

        $ hg up -C 0

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

        $ hg up

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

        $ hg st

        $ 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

				$ "$TESTDIR/hghave" execbit \|\| exit 80

				$ rm -rf a
				$ hg init a
				$ cd a

				$ echo foo > foo
				$ hg ci -qAm0
				$ chmod +x foo
				$ hg ci -m1
				$ hg co -q 0
				$ echo dirty > foo
				$ hg up -c
				abort: uncommitted local changes
				[255]
				$ hg up -q
				$ cat foo
				dirty
				$ hg st -A
				M foo

				Validate update of standalone execute bit change:

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ chmod -x foo
				$ hg ci -m removeexec
				nothing changed
				[1]
				$ hg up -C 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg up
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st

				$ cd ..