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

Adrian Buehlmann - - Load All Authors

File last commit:

r12279:28e2e380 default


                r18006:0c10cf81

2.4.1 stable

Download file

             test-push-hook-lock.t
        
                    31 lines
            
             | 702 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-hook-lock.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init 1

        $ echo '[ui]' >> 1/.hg/hgrc

        $ echo 'timeout = 10' >> 1/.hg/hgrc

        $ echo foo > 1/foo

        $ hg --cwd 1 ci -A -m foo

        adding foo

        $ hg clone 1 2

        updating to branch default

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

        $ hg clone 2 3

        updating to branch default

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

        $ echo '[hooks]' >> 2/.hg/hgrc

        $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

        $ echo bar >> 3/foo

        $ hg --cwd 3 ci -m bar

        $ hg --cwd 3 push ../2

        pushing to ../2

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

	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 1

				$ echo '[ui]' >> 1/.hg/hgrc
				$ echo 'timeout = 10' >> 1/.hg/hgrc

				$ echo foo > 1/foo
				$ hg --cwd 1 ci -A -m foo
				adding foo

				$ hg clone 1 2
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg clone 2 3
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo '[hooks]' >> 2/.hg/hgrc
				$ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

				$ echo bar >> 3/foo
				$ hg --cwd 3 ci -m bar

				$ hg --cwd 3 push ../2
				pushing to ../2
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files