upstream/mercurial-mirror Files · tests/test-obsolete-changeset-exchange.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.

Pierre-Yves David - - Load All Authors

File last commit:

r17327:7f5094bb 2.3 stable


                r18006:0c10cf81

2.4.1 stable

Download file

             test-obsolete-changeset-exchange.t
        
                    55 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-obsolete-changeset-exchange.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test changesets filtering during exchanges (some tests are still in

      test-obsolete.t)

        $ cat > obs.py << EOF

        > import mercurial.obsolete

        > mercurial.obsolete._enabled = True

        > EOF

        $ echo '[extensions]' >> $HGRCPATH

        $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH

      Push does not corrupt remote

      ----------------------------

      Create a DAG where a changeset reuses a revision from a file first used in an

      extinct changeset.

        $ hg init local

        $ cd local

        $ echo 'base' > base

        $ hg commit -Am base

        adding base

        $ echo 'A' > A

        $ hg commit -Am A

        adding A

        $ hg up 0

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

        $ hg revert -ar 1

        adding A

        $ hg commit -Am "A'"

        created new head

        $ hg log -G --template='{desc} {node}'

        @  A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

        |

        | o  A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a

        |/

        o  base d20a80d4def38df63a4b330b7fb688f3d4cae1e3

        $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

      Push it. The bundle should not refer to the extinct changeset.

        $ hg init ../other

        $ hg push ../other

        pushing to ../other

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 2 files

        $ hg -R ../other verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        2 files, 2 changesets, 2 total revisions

	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

				Test changesets filtering during exchanges (some tests are still in
				test-obsolete.t)

				$ cat > obs.py << EOF
				> import mercurial.obsolete
				> mercurial.obsolete._enabled = True
				> EOF
				$ echo '[extensions]' >> $HGRCPATH
				$ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH

				Push does not corrupt remote
				----------------------------

				Create a DAG where a changeset reuses a revision from a file first used in an
				extinct changeset.

				$ hg init local
				$ cd local
				$ echo 'base' > base
				$ hg commit -Am base
				adding base
				$ echo 'A' > A
				$ hg commit -Am A
				adding A
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg revert -ar 1
				adding A
				$ hg commit -Am "A'"
				created new head
				$ hg log -G --template='{desc} {node}'
				@ A' f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
				\|
				\| o A 9d73aac1b2ed7d53835eaeec212ed41ea47da53a
				\|/
				o base d20a80d4def38df63a4b330b7fb688f3d4cae1e3

				$ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee

				Push it. The bundle should not refer to the extinct changeset.

				$ hg init ../other
				$ hg push ../other
				pushing to ../other
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files
				$ hg -R ../other verify
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				2 files, 2 changesets, 2 total revisions