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

httppeer: implement command executor for version 2 peer...

httppeer: implement command executor for version 2 peer Now that we have a new API for issuing commands which is compatible with wire protocol version 2, we can start using it with wire protocol version 2. This commit replaces our hacky implementation of _call() with something a bit more robust based on the new command executor interface. We now have proper support for issuing multiple commands per HTTP request. Each HTTP request maintains its own client reactor. The implementation is similar to the one in the legacy wire protocol. We use a ThreadPoolExecutor for spinning up a thread to read the HTTP response in the background. This allows responses to resolve in any order. While not implemented on the server yet, a client could use concurrent.futures.as_completed() with a collection of futures and handle responses as they arrive from the server. The return value from issued commands is still a simple list of raw or decoded CBOR data. This is still super hacky. We will want a rich data type for representing command responses. But at least this commit gets us one step closer to a proper peer implementation. Differential Revision: https://phab.mercurial-scm.org/D3297

Martin von Zweigbergk - - Load All Authors

File last commit:

r35727:1a09dad8 default


                r37669:950294e2

default

Download file

             test-push-checkheads-unpushed-D5.t
        
                    113 lines
            
             | 3.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D5.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case D-5

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

      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 5: multi-changeset branch, split on multiple other, (head on its own new branch)

      .. old-state:

      ..

      .. * 2 branch (1 changeset, and 2 changesets)

      ..

      .. new-state:

      ..

      .. * 1 new branch superceeding the head of the old-2-changesets-branch,

      .. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other

      ..

      .. expected-result:

      ..

      .. * push the new branch only -> push denied

      .. * push the existing branch only -> push allowed

      ..   /!\ This push create unstability/orphaning on the other hand and we should

      ..  probably detect/warn agains that.

      ..

      .. graph-summary:

      ..

      ..   B ø⇠◔ B'

      ..     | |

      .. A'◔⇢ø |

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

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

      Test setup

      ----------

        $ mkdir D5

        $ cd D5

        $ 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

        $ hg up 0

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

        $ mkcommit C0

        created new head

        $ cd ../client

        $ hg pull

        pulling from $TESTTMP/D5/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        new changesets d73caddc5533:0f88766e02d6

        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg up 'desc(C0)'

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

        $ mkcommit A1

        $ hg up 0

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

        $ mkcommit B1

        created new head

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

        obsoleted 1 changesets

        1 new orphan changesets

        $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  25c56d33e4c4 (draft): B1

        |

        | o  a0802eb7fc1b (draft): A1

        | |

        | o  0f88766e02d6 (draft): C0

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

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

        pushing to $TESTTMP/D5/server

        searching for changes

        abort: push creates new remote head 25c56d33e4c4!

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

        [255]

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

        pushing to $TESTTMP/D5/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        1 new obsolescence markers

        obsoleted 1 changesets

        1 new orphan changesets

        $ 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

				====================================
				Testing head checking code: Case D-5
				====================================

				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 5: multi-changeset branch, split on multiple other, (head on its own new branch)

				.. old-state:
				..
				.. * 2 branch (1 changeset, and 2 changesets)
				..
				.. new-state:
				..
				.. * 1 new branch superceeding the head of the old-2-changesets-branch,
				.. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other
				..
				.. expected-result:
				..
				.. * push the new branch only -> push denied
				.. * push the existing branch only -> push allowed
				.. /!\ This push create unstability/orphaning on the other hand and we should
				.. probably detect/warn agains that.
				..
				.. graph-summary:
				..
				.. B ø⇠◔ B'
				.. \| \|
				.. A'◔⇢ø \|
				.. \| \|/
				.. C ● \|
				.. \\|
				.. ●

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

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

				$ mkdir D5
				$ cd D5
				$ 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
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit C0
				created new head
				$ cd ../client
				$ hg pull
				pulling from $TESTTMP/D5/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files (+1 heads)
				new changesets d73caddc5533:0f88766e02d6
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg up 'desc(C0)'
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit A1
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit B1
				created new head
				$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
				obsoleted 1 changesets
				1 new orphan changesets
				$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
				obsoleted 1 changesets
				$ hg log -G --hidden
				@ 25c56d33e4c4 (draft): B1
				\|
				\| o a0802eb7fc1b (draft): A1
				\| \|
				\| o 0f88766e02d6 (draft): C0
				\|/
				\| x d73caddc5533 (draft): B0
				\| \|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push --rev 'desc(B1)'
				pushing to $TESTTMP/D5/server
				searching for changes
				abort: push creates new remote head 25c56d33e4c4!
				(merge or see 'hg help push' for details about pushing new heads)
				[255]
				$ hg push --rev 'desc(A1)'
				pushing to $TESTTMP/D5/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				1 new obsolescence markers
				obsoleted 1 changesets
				1 new orphan changesets

				$ cd ../..