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

exchange: move disabling of rev-branch-cache bundle part out of narrow...

exchange: move disabling of rev-branch-cache bundle part out of narrow I'm attempting to refactor changegroup code in order to better support alternate storage backends. The narrow extension is performing a lot of monkeypatching to this code and it is making it difficult to reason about how everything works. I'm reasonably certain I would be unable to abstract storage without requiring extensive rework of narrow. I believe it is less effort to move narrow code into core so it can be accounted for when changegroup code is refactored. So I'll be doing that. The first part of this is integrating the disabling of the cache:rev-branch-cache bundle2 part into core. This doesn't seem like it is related to changegroup, but narrow's modifications to changegroup are invasive and also require taking its code for bundle generation and exchange into core in order for the changegroup code to work. Differential Revision: https://phab.mercurial-scm.org/D4007

Martin von Zweigbergk - - Load All Authors

File last commit:

r35727:1a09dad8 default


                r38813:ab765bc4

default

Download file

             test-push-checkheads-superceed-A6.t
        
                    103 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A6.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r31979
            
      ====================================

      Testing head checking code: Case A-6

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

      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 A: simple case involving a branch being superceeded by another.

      TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch), same number of head

      .. old-state:

      ..

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

      ..

      .. new-state:

      ..

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

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

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      .. B'◔⇢ø B

      ..   | |

      .. A | ø⇠◔ A'

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

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

      Test setup

      ----------

        $ mkdir A6

        $ cd A6

        $ 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

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

              r35394
            
        pulling from $TESTTMP/A6/server

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

              r31979
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets d73caddc5533:0f88766e02d6

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

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

        $ hg up 0

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

        $ mkcommit A1

        created new head

        $ hg up 'desc(C0)'

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

        $ mkcommit B1

        $ 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 A6...

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

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

              r31979
            
        $ hg log -G --hidden

        @  d70a1f75a020 (draft): B1

        |

        | o  f6082bc4ffef (draft): A1

        | |

        o |  0f88766e02d6 (draft): C0

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | 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/A6/server

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

              r31979
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        2 new obsolescence markers

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

              r33249
            
        obsoleted 2 changesets

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

              r31979
            
        $ 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 A6...	r31979	====================================
		Testing head checking code: Case A-6
		====================================

		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 A: simple case involving a branch being superceeded by another.
		TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch), same number of head

		.. old-state:
		..
		.. * 2 branch (1-changeset, and 2-changesets)
		..
		.. new-state:
		..
		.. * 1 new branch superceeding the base of the old-2-changesets-branch,
		.. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other
		..
		.. expected-result:
		..
		.. * push allowed
		..
		.. graph-summary:
		..
		.. B'◔⇢ø B
		.. \| \|
		.. A \| ø⇠◔ A'
		.. \| \|/
		.. C ● \|
		.. \\|
		.. ●

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

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

		$ mkdir A6
		$ cd A6
		$ 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
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pulling from $TESTTMP/A6/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A6...	r31979	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files (+1 heads)
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets d73caddc5533:0f88766e02d6
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A6...	r31979	(run 'hg heads' to see heads, 'hg merge' to merge)
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit A1
		created new head
		$ hg up 'desc(C0)'
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit B1
		$ 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 A6...	r31979	$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
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 A6...	r31979	$ hg log -G --hidden
		@ d70a1f75a020 (draft): B1
		\|
		\| o f6082bc4ffef (draft): A1
		\| \|
		o \| 0f88766e02d6 (draft): C0
		\|/
		\| x d73caddc5533 (draft): B0
		\| \|
		\| 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/A6/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A6...	r31979	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files (+1 heads)
		2 new obsolescence markers
marmoute obsolete: reports the number of local changeset obsoleted when unbundling...	r33249	obsoleted 2 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A6...	r31979
		$ cd ../..