upstream/mercurial-mirror Files · tests/test-push-checkheads-unpushed-D2.t

internals: extract frame-based protocol docs to own document...

internals: extract frame-based protocol docs to own document wireprotocol.txt is quite long and difficult to digest. The frame-based protocol is effectively a standalone concept (and could even be used outside of Mercurial). So this commit extracts its docs to a standalone file. The first few paragraphs were rewritten as part of the extraction. Sections headers were adjusted accordingly. Existing referalls in wireprotocol.txt were updated to refer to the new doc / concept, which I've started referring to as `hgrpc`. I'm on the fence as to whether to move the HTTP and SSH transport details to the new doc as well. For now, I'm leaving them in wireprotocol.txt. Differential Revision: https://phab.mercurial-scm.org/D4443

Boris Feld - - Load All Authors

File last commit:

r39516:89630d0b default


                r39594:b0e0db15

default

Download file

             test-push-checkheads-unpushed-D2.t
        
                    97 lines
            
             | 2.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D2.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r31987
            
      ====================================

      Testing head checking code: Case D-2

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

      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.

      Category D: remote head is "obs-affected" locally, but result is not part of the push

      TestCase 1: remote branch has 2 changes, head is pruned, other is rewritten but result is not pushed

      .. old-state:

      ..

      .. * 1 changeset branch

      ..

      .. new-state:

      ..

      .. * old head is pruned

      .. * 1 new branch succeeding to the other changeset in the old branch

      .. * 1 new unrelated branch

      ..

      .. expected-result:

      ..

      .. * push allowed

      .. * pushing only the unrelated branch: denied

      ..

      .. graph-summary:

      ..

      ..   B ⊗

      ..     |

      ..   A ø⇠○ A'

      ..     |/

      ..     | ◔ C

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir D2

        $ cd D2

        $ setuprepos

        creating basic server and client repo

        updating to branch default

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

        $ cd server

        $ mkcommit B0

        $ cd ../client

        $ hg pull

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

              r35394
            
        pulling from $TESTTMP/D2/server

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

              r31987
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        Boris Feld
    
phase: report number of non-public changeset alongside the new range...

              r39516
            
        new changesets d73caddc5533 (1 drafts)

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

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

        $ hg up 0

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

        $ mkcommit A1

        created new head

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

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

              r33542
            
        obsoleted 1 changesets

        Martin von Zweigbergk
    
evolution: report new unstable changesets...

              r35727
            
        1 new orphan changesets

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

              r31987
            
        $ hg debugobsolete --record-parents `getid "desc(B0)"`

        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 D2...

              r31987
            
        $ hg up 0

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

        $ mkcommit C0

        created new head

        $ hg log -G --hidden

        @  0f88766e02d6 (draft): C0

        |

        | o  f6082bc4ffef (draft): A1

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push --rev 'desc(C0)'

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

              r35394
            
        pushing to $TESTTMP/D2/server

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

              r31987
            
        searching for changes

        abort: push creates new remote head 0f88766e02d6!

        (merge or see 'hg help push' for details about pushing new heads)

        [255]

        $ 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 D2...	r31987	====================================
		Testing head checking code: Case D-2
		====================================

		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.

		Category D: remote head is "obs-affected" locally, but result is not part of the push
		TestCase 1: remote branch has 2 changes, head is pruned, other is rewritten but result is not pushed

		.. old-state:
		..
		.. * 1 changeset branch
		..
		.. new-state:
		..
		.. * old head is pruned
		.. * 1 new branch succeeding to the other changeset in the old branch
		.. * 1 new unrelated branch
		..
		.. expected-result:
		..
		.. * push allowed
		.. * pushing only the unrelated branch: denied
		..
		.. graph-summary:
		..
		.. B ⊗
		.. \|
		.. A ø⇠○ A'
		.. \|/
		.. \| ◔ C
		.. \|/
		.. ●

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

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

		$ mkdir D2
		$ cd D2
		$ setuprepos
		creating basic server and client repo
		updating to branch default
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd server
		$ mkcommit B0
		$ cd ../client
		$ hg pull
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pulling from $TESTTMP/D2/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case D2...	r31987	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
Boris Feld phase: report number of non-public changeset alongside the new range...	r39516	new changesets d73caddc5533 (1 drafts)
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case D2...	r31987	(run 'hg update' to get a working copy)
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit A1
		created new head
		$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Martin von Zweigbergk evolution: report new unstable changesets...	r35727	1 new orphan changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case D2...	r31987	$ hg debugobsolete --record-parents `getid "desc(B0)"`
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 D2...	r31987	$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit C0
		created new head
		$ hg log -G --hidden
		@ 0f88766e02d6 (draft): C0
		\|
		\| o f6082bc4ffef (draft): A1
		\|/
		\| x d73caddc5533 (draft): B0
		\| \|
		\| x 8aaa48160adc (draft): A0
		\|/
		o 1e4be0697311 (public): root


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

		$ hg push --rev 'desc(C0)'
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pushing to $TESTTMP/D2/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case D2...	r31987	searching for changes
		abort: push creates new remote head 0f88766e02d6!
		(merge or see 'hg help push' for details about pushing new heads)
		[255]

		$ cd ../..