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

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo >> foo

        $ hg ci -m 'change foo'

        $ hg up -qC 0

        $ echo bar > bar

        $ hg ci -qAm 'add bar'

        $ hg log

        changeset:   2:effea6de0384

        tag:         tip

        parent:      0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add bar

        changeset:   1:ed1b79f46b9a

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

        $ cd ..

      don't show "(+1 heads)" message when pulling closed head

        $ hg clone -q repo repo2

        $ hg clone -q repo2 repo3

        $ cd repo2

        $ hg up -q 0

        $ echo hello >> foo

        $ hg ci -mx1

        created new head

        $ hg ci -mx2 --close-branch

        $ cd ../repo3

        $ hg heads -q --closed

        2:effea6de0384

        1:ed1b79f46b9a

        $ hg pull

        pulling from $TESTTMP/repo2 (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 1 changes to 1 files

        (run 'hg update' to get a working copy)

        $ hg heads -q --closed

        4:00cfe9073916

        2:effea6de0384

        1:ed1b79f46b9a

        $ cd ..

        $ hg init copy

        $ cd copy

      Pull a missing revision:

        $ hg pull -qr missing ../repo

        abort: unknown revision 'missing'!

        [255]

      Pull multiple revisions with update:

        $ hg pull -qu -r 0 -r 1 ../repo

        $ hg -q parents

        0:bbd179dfa0a7

        $ hg rollback

        repository tip rolled back to revision -1 (undo pull)

        working directory now based on revision -1

        $ hg pull -qr 0 ../repo

        $ hg log

        changeset:   0:bbd179dfa0a7

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

        $ hg pull -qr 1 ../repo

        $ hg log

        changeset:   1:ed1b79f46b9a

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add foo

      This used to abort: received changelog group is empty:

        $ hg pull -qr 1 ../repo

        $ 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 repo
				$ cd repo
				$ echo foo > foo
				$ hg ci -qAm 'add foo'
				$ echo >> foo
				$ hg ci -m 'change foo'
				$ hg up -qC 0
				$ echo bar > bar
				$ hg ci -qAm 'add bar'

				$ hg log
				changeset: 2:effea6de0384
				tag: tip
				parent: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add bar

				changeset: 1:ed1b79f46b9a
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ cd ..

				don't show "(+1 heads)" message when pulling closed head

				$ hg clone -q repo repo2
				$ hg clone -q repo2 repo3
				$ cd repo2
				$ hg up -q 0
				$ echo hello >> foo
				$ hg ci -mx1
				created new head
				$ hg ci -mx2 --close-branch
				$ cd ../repo3
				$ hg heads -q --closed
				2:effea6de0384
				1:ed1b79f46b9a
				$ hg pull
				pulling from $TESTTMP/repo2 (glob)
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 1 changes to 1 files
				(run 'hg update' to get a working copy)
				$ hg heads -q --closed
				4:00cfe9073916
				2:effea6de0384
				1:ed1b79f46b9a

				$ cd ..

				$ hg init copy
				$ cd copy

				Pull a missing revision:

				$ hg pull -qr missing ../repo
				abort: unknown revision 'missing'!
				[255]

				Pull multiple revisions with update:

				$ hg pull -qu -r 0 -r 1 ../repo
				$ hg -q parents
				0:bbd179dfa0a7
				$ hg rollback
				repository tip rolled back to revision -1 (undo pull)
				working directory now based on revision -1

				$ hg pull -qr 0 ../repo
				$ hg log
				changeset: 0:bbd179dfa0a7
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ hg pull -qr 1 ../repo
				$ hg log
				changeset: 1:ed1b79f46b9a
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo


				This used to abort: received changelog group is empty:

				$ hg pull -qr 1 ../repo

				$ cd ..