upstream/mercurial-mirror Files · tests/test-paths.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-paths.t
        
                    65 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-paths.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ hg clone a b

        updating to branch default

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

        $ cd a

        $ echo '[paths]' >> .hg/hgrc

        $ echo 'dupe = ../b' >> .hg/hgrc

        $ echo 'expand = $SOMETHING/bar' >> .hg/hgrc

        $ hg in dupe

        comparing with $TESTTMP/b (glob)

        no changes found

        [1]

        $ cd ..

        $ hg -R a in dupe

        comparing with $TESTTMP/b (glob)

        no changes found

        [1]

        $ cd a

        $ hg paths

        dupe = $TESTTMP/b (glob)

        expand = $TESTTMP/a/$SOMETHING/bar (glob)

        $ SOMETHING=foo hg paths

        dupe = $TESTTMP/b (glob)

        expand = $TESTTMP/a/foo/bar (glob)

      #if msys

        $ SOMETHING=//foo hg paths

        dupe = $TESTTMP/b (glob)

        expand = /foo/bar

      #else

        $ SOMETHING=/foo hg paths

        dupe = $TESTTMP/b (glob)

        expand = /foo/bar

      #endif

        $ hg paths -q

        dupe

        expand

        $ hg paths dupe

        $TESTTMP/b (glob)

        $ hg paths -q dupe

        $ hg paths unknown

        not found!

        [1]

        $ hg paths -q unknown

        [1]

        $ cd ..

      'file:' disables [paths] entries for clone destination

        $ cat >> $HGRCPATH <<EOF

        > [paths]

        > gpath1 = http://hg.example.com

        > EOF

        $ hg clone a gpath1

        abort: cannot create new http repository

        [255]

        $ hg clone a file:gpath1

        updating to branch default

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

        $ cd gpath1

        $ hg -q id

        000000000000

        $ 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 a
				$ hg clone a b
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd a
				$ echo '[paths]' >> .hg/hgrc
				$ echo 'dupe = ../b' >> .hg/hgrc
				$ echo 'expand = $SOMETHING/bar' >> .hg/hgrc
				$ hg in dupe
				comparing with $TESTTMP/b (glob)
				no changes found
				[1]
				$ cd ..
				$ hg -R a in dupe
				comparing with $TESTTMP/b (glob)
				no changes found
				[1]
				$ cd a
				$ hg paths
				dupe = $TESTTMP/b (glob)
				expand = $TESTTMP/a/$SOMETHING/bar (glob)
				$ SOMETHING=foo hg paths
				dupe = $TESTTMP/b (glob)
				expand = $TESTTMP/a/foo/bar (glob)
				#if msys
				$ SOMETHING=//foo hg paths
				dupe = $TESTTMP/b (glob)
				expand = /foo/bar
				#else
				$ SOMETHING=/foo hg paths
				dupe = $TESTTMP/b (glob)
				expand = /foo/bar
				#endif
				$ hg paths -q
				dupe
				expand
				$ hg paths dupe
				$TESTTMP/b (glob)
				$ hg paths -q dupe
				$ hg paths unknown
				not found!
				[1]
				$ hg paths -q unknown
				[1]
				$ cd ..

				'file:' disables [paths] entries for clone destination

				$ cat >> $HGRCPATH <<EOF
				> [paths]
				> gpath1 = http://hg.example.com
				> EOF

				$ hg clone a gpath1
				abort: cannot create new http repository
				[255]

				$ hg clone a file:gpath1
				updating to branch default
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd gpath1
				$ hg -q id
				000000000000

				$ cd ..