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

r16912:6ef3107c default


                r18006:0c10cf81

2.4.1 stable

Download file

             test-addremove.t
        
                    48 lines
            
             | 845 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-addremove.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init rep

        $ cd rep

        $ mkdir dir

        $ touch foo dir/bar

        $ hg -v addremove

        adding dir/bar

        adding foo

        $ hg -v commit -m "add 1"

        dir/bar

        foo

        committed changeset 0:6f7f953567a2

        $ cd dir/

        $ touch ../foo_2 bar_2

        $ hg -v addremove

        adding dir/bar_2

        adding foo_2

        $ hg -v commit -m "add 2"

        dir/bar_2

        foo_2

        committed changeset 1:e65414bf35c5

        $ cd ../..

        $ hg init sim

        $ cd sim

        $ echo a > a

        $ echo a >> a

        $ echo a >> a

        $ echo c > c

        $ hg commit -Ama

        adding a

        adding c

        $ mv a b

        $ rm c

        $ echo d > d

        $ hg addremove -n -s 50 # issue 1696

        removing a

        adding b

        removing c

        adding d

        recording removal of a as rename to b (100% similar)

        $ hg addremove -s 50

        removing a

        adding b

        removing c

        adding d

        recording removal of a as rename to b (100% similar)

        $ hg commit -mb

        $ 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

				$ hg init rep
				$ cd rep
				$ mkdir dir
				$ touch foo dir/bar
				$ hg -v addremove
				adding dir/bar
				adding foo
				$ hg -v commit -m "add 1"
				dir/bar
				foo
				committed changeset 0:6f7f953567a2
				$ cd dir/
				$ touch ../foo_2 bar_2
				$ hg -v addremove
				adding dir/bar_2
				adding foo_2
				$ hg -v commit -m "add 2"
				dir/bar_2
				foo_2
				committed changeset 1:e65414bf35c5
				$ cd ../..

				$ hg init sim
				$ cd sim
				$ echo a > a
				$ echo a >> a
				$ echo a >> a
				$ echo c > c
				$ hg commit -Ama
				adding a
				adding c
				$ mv a b
				$ rm c
				$ echo d > d
				$ hg addremove -n -s 50 # issue 1696
				removing a
				adding b
				removing c
				adding d
				recording removal of a as rename to b (100% similar)
				$ hg addremove -s 50
				removing a
				adding b
				removing c
				adding d
				recording removal of a as rename to b (100% similar)
				$ hg commit -mb
				$ cd ..