upstream/mercurial-mirror Files · tests/test-push-checkheads-superceed-A8.t

revlog: subclass the new `repository.iverifyproblem` Protocol class...

revlog: subclass the new `repository.iverifyproblem` Protocol class This is the same transformation as did for dirstate, but the CamelCase naming was already cleaned up here. We shouldn't have to explicitly subclass, but I'm doing so to test the interplay of regular attributes and the `attrs` class. Also, PyCharm has a nifty feature that puts a jump point in the gutter to navigate back and forth between the base class and subclasses (and override functions and base class functions) when there's an explicit subclassing. Additionally, PyCharm will immediately flag signature mismatches without a 40m pytype run.

av6 - - Load All Authors

File last commit:

r50061:5996640f default


                r53365:4ef6dbc2

default

Download file

             test-push-checkheads-superceed-A8.t
        
                    84 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A8.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A8...

              r31981
            
      ====================================

      Testing head checking code: Case A-8

      ====================================

      Mercurial checks for the introduction of new heads on push. Evolution comes

      into play to detect if existing branches on the server are being replaced by

      some of the new one we push.

      This case is part of a series of tests checking this behavior.

        av6
    
tests: fix misspelling of supersede...

              r50061
            
      Category A: simple case involving a branch being superseded by another.

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A8...

              r31981
            
      TestCase 8: single-changeset branch indirect rewrite

      .. old-state:

      ..

      .. * 1-changeset branch

      ..

      .. new-state:

      ..

      .. * 1-changeset branch succeeding to A, through another unpushed changesets

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..       A'

      ..   A ø⇠ø⇠◔ A''

      ..     |/ /

      ..     | /

      ..     |/

      ..     ●

        $ . $TESTDIR/testlib/push-checkheads-util.sh

      Test setup

      ----------

        $ mkdir A8

        $ cd A8

        $ setuprepos

        creating basic server and client repo

        updating to branch default

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

        $ cd client

        $ hg up 0

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

        $ mkcommit A1

        created new head

        $ hg up 0

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

        $ mkcommit A2

        created new head

        $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`

        marmoute
    
debugobsolete: also issue the "new obsmarkers" messsage...

              r43163
            
        1 new obsolescence markers

        Boris Feld
    
debugobsolete: also report the number of obsoleted changesets...

              r33542
            
        obsoleted 1 changesets

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A8...

              r31981
            
        $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`

        marmoute
    
debugobsolete: also issue the "new obsmarkers" messsage...

              r43163
            
        1 new obsolescence markers

        Boris Feld
    
debugobsolete: also report the number of obsoleted changesets...

              r33542
            
        obsoleted 1 changesets

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A8...

              r31981
            
        $ hg log -G --hidden

        @  c1f8d089020f (draft): A2

        |

        | x  f6082bc4ffef (draft): A1

        |/

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

        Matt Harbison
    
tests: remove (glob) annotations that were only for '\' matches...

              r35394
            
        pushing to $TESTTMP/A8/server

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A8...

              r31981
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files (+1 heads)

        2 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        obsoleted 1 changesets

        Pierre-Yves David
    
obsolescence: add test for the "branch replacement" logic during push, case A8...

              r31981
            
        $ 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

Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A8...	r31981	====================================
		Testing head checking code: Case A-8
		====================================

		Mercurial checks for the introduction of new heads on push. Evolution comes
		into play to detect if existing branches on the server are being replaced by
		some of the new one we push.

		This case is part of a series of tests checking this behavior.

av6 tests: fix misspelling of supersede...	r50061	Category A: simple case involving a branch being superseded by another.
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A8...	r31981	TestCase 8: single-changeset branch indirect rewrite

		.. old-state:
		..
		.. * 1-changeset branch
		..
		.. new-state:
		..
		.. * 1-changeset branch succeeding to A, through another unpushed changesets
		..
		.. expected-result:
		..
		.. * push allowed
		..
		.. graph-summary:
		..
		.. A'
		.. A ø⇠ø⇠◔ A''
		.. \|/ /
		.. \| /
		.. \|/
		.. ●

		$ . $TESTDIR/testlib/push-checkheads-util.sh

		Test setup
		----------

		$ mkdir A8
		$ cd A8
		$ setuprepos
		creating basic server and client repo
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd client
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit A1
		created new head
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit A2
		created new head
		$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
marmoute debugobsolete: also issue the "new obsmarkers" messsage...	r43163	1 new obsolescence markers
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A8...	r31981	$ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
marmoute debugobsolete: also issue the "new obsmarkers" messsage...	r43163	1 new obsolescence markers
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A8...	r31981	$ hg log -G --hidden
		@ c1f8d089020f (draft): A2
		\|
		\| x f6082bc4ffef (draft): A1
		\|/
		\| x 8aaa48160adc (draft): A0
		\|/
		o 1e4be0697311 (public): root


		Actual testing
		--------------

		$ hg push
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pushing to $TESTTMP/A8/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A8...	r31981	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		2 new obsolescence markers
marmoute obsolete: reports the number of local changeset obsoleted when unbundling...	r33249	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A8...	r31981
		$ cd ../..