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

r12260:0a63e91c default


                r18006:0c10cf81

2.4.1 stable

Download file

             test-merge-remove.t
        
                    87 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-remove.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo foo > foo

        $ echo bar > bar

        $ hg ci -qAm 'add foo bar'

        $ echo foo2 >> foo

        $ echo bleh > bar

        $ hg ci -m 'change foo bar'

        $ hg up -qC 0

        $ hg mv foo foo1

        $ echo foo1 > foo1

        $ hg cat foo >> foo1

        $ hg ci -m 'mv foo foo1'

        created new head

        $ hg merge

        merging foo1 and foo to foo1

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

        (branch merge, don't forget to commit)

        $ hg debugstate --nodates

        n   0         -2 bar

        m 644         14 foo1

        copy: foo -> foo1

        $ hg st -q

        M bar

        M foo1

      Removing foo1 and bar:

        $ cp foo1 F

        $ cp bar B

        $ hg rm -f foo1 bar

        $ hg debugstate --nodates

        r   0         -2 bar

        r   0         -1 foo1

        copy: foo -> foo1

        $ hg st -qC

        R bar

        R foo1

      Re-adding foo1 and bar:

        $ cp F foo1

        $ cp B bar

        $ hg add -v foo1 bar

        adding bar

        adding foo1

        $ hg debugstate --nodates

        n   0         -2 bar

        m 644         14 foo1

        copy: foo -> foo1

        $ hg st -qC

        M bar

        M foo1

          foo

      Reverting foo1 and bar:

        $ hg revert -vr . foo1 bar

        saving current version of bar as bar.orig

        reverting bar

        saving current version of foo1 as foo1.orig

        reverting foo1

        $ hg debugstate --nodates

        n   0         -2 bar

        m 644         14 foo1

        copy: foo -> foo1

        $ hg st -qC

        M bar

        M foo1

          foo

        $ hg diff

	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

				$ echo foo > foo
				$ echo bar > bar
				$ hg ci -qAm 'add foo bar'

				$ echo foo2 >> foo
				$ echo bleh > bar
				$ hg ci -m 'change foo bar'

				$ hg up -qC 0
				$ hg mv foo foo1
				$ echo foo1 > foo1
				$ hg cat foo >> foo1
				$ hg ci -m 'mv foo foo1'
				created new head

				$ hg merge
				merging foo1 and foo to foo1
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg debugstate --nodates
				n 0 -2 bar
				m 644 14 foo1
				copy: foo -> foo1

				$ hg st -q
				M bar
				M foo1


				Removing foo1 and bar:

				$ cp foo1 F
				$ cp bar B
				$ hg rm -f foo1 bar

				$ hg debugstate --nodates
				r 0 -2 bar
				r 0 -1 foo1
				copy: foo -> foo1

				$ hg st -qC
				R bar
				R foo1


				Re-adding foo1 and bar:

				$ cp F foo1
				$ cp B bar
				$ hg add -v foo1 bar
				adding bar
				adding foo1

				$ hg debugstate --nodates
				n 0 -2 bar
				m 644 14 foo1
				copy: foo -> foo1

				$ hg st -qC
				M bar
				M foo1
				foo


				Reverting foo1 and bar:

				$ hg revert -vr . foo1 bar
				saving current version of bar as bar.orig
				reverting bar
				saving current version of foo1 as foo1.orig
				reverting foo1

				$ hg debugstate --nodates
				n 0 -2 bar
				m 644 14 foo1
				copy: foo -> foo1

				$ hg st -qC
				M bar
				M foo1
				foo

				$ hg diff