upstream/mercurial-mirror Files · tests/test-exchange-obsmarkers-case-C4.t

revlog: extract function for getting node from known-to-exist rev...

revlog: extract function for getting node from known-to-exist rev Many of the calls to index_node() (which converts a rev to a nodeid) are done with a rev that's know to exist. If the function fails, there's something really wrong and we should just abort. This was done in only one place. This patch starts by extracting that code to a function that we can reuse in later patches. Differential Revision: https://phab.mercurial-scm.org/D3456

Martin von Zweigbergk - - Load All Authors

File last commit:

r35727:1a09dad8 default


                r37877:a91f31a1

default

Download file

             test-exchange-obsmarkers-case-C4.t
        
                    131 lines
            
             | 4.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-exchange-obsmarkers-case-C4.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pierre-Yves David
    
obsolescence: add test case C-4 for obsolescence markers exchange...

              r31968
            
      ============================================

      Testing obsolescence markers push: Cases C.4

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

      Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of

      all changesets that requested to be "in sync" after the push (even if they are

      already on both side).

      This test belongs to a series of tests checking such set is properly computed

      and applied. This does not tests "obsmarkers" discovery capabilities.

      Category C: advanced case

      TestCase 4: multiple successors, one is pruned

      C.4 multiple successors, one is pruned

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

      .. (A similarish situation can appends with split markers see the Z section)

      ..

      .. {{{

      ..        A

      ..    B ○⇢ø⇠⊗ C

      ..       \|/

      ..        ● O

      .. }}}

      ..

      .. Marker exist from:

      ..

      ..  * `A ø⇠○ B`

      ..  * `A ø⇠○ C`

      ..  * C (prune)

      ..

      .. Command run:

      ..

      ..  * hg push -r O

      ..

      .. Expected exchange:

      ..

      ..  * `A ø⇠○ C`

      ..  * C (prune)

      ..

      .. Expected exclude:

      ..

      ..  * `A ø⇠○ B`

      Setup

      -----

        $ . $TESTDIR/testlib/exchange-obsmarker-util.sh

      Implemented as the non-split version

        $ setuprepos C.4

        creating test repo for test case C.4

        - pulldest

        - main

        - pushdest

        cd into `main` and proceed with env setup

        $ cd main

        $ mkcommit A

        $ hg update -q 0

        $ mkcommit B

        created new head

        $ hg update -q 0

        $ mkcommit C

        created new head

        $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`

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

              r33542
            
        obsoleted 1 changesets

        Pierre-Yves David
    
obsolescence: add test case C-4 for obsolescence markers exchange...

              r31968
            
        $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`

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

              r35727
            
        2 new content-divergent changesets

        Pierre-Yves David
    
obsolescence: add test case C-4 for obsolescence markers exchange...

              r31968
            
        $ hg prune -qd '0 0' .

        $ hg log -G --hidden

        x  7f7f229b13a6 (draft): C

        |

        | o  35b183996678 (draft): B

        |/

        | x  f5bc6836db60 (draft): A

        |/

        @  a9bdc8b26820 (public): O

        $ inspect_obsmarkers

        obsstore content

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

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        $ cd ..

        $ cd ..

      Actual Test

      -----------

        $ dotest C.4 O

        ## Running testcase C.4

        # testing echange of "O" (a9bdc8b26820)

        ## initial state

        # obstore: main

        7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        # obstore: pulldest

        ## pushing "O" from main to pushdest

        pushing to pushdest

        searching for changes

        no changes found

        remote: 2 new obsolescence markers

        ## post push state

        # obstore: main

        7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pulldest

        ## pulling "a9bdc8b26820" from main into pulldest

        pulling from main

        no changes found

        2 new obsolescence markers

        ## post pull state

        # obstore: main

        7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pulldest

        7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

	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 case C-4 for obsolescence markers exchange...	r31968	============================================
		Testing obsolescence markers push: Cases C.4
		============================================

		Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
		all changesets that requested to be "in sync" after the push (even if they are
		already on both side).

		This test belongs to a series of tests checking such set is properly computed
		and applied. This does not tests "obsmarkers" discovery capabilities.

		Category C: advanced case
		TestCase 4: multiple successors, one is pruned

		C.4 multiple successors, one is pruned
		======================================

		.. (A similarish situation can appends with split markers see the Z section)
		..
		.. {{{
		.. A
		.. B ○⇢ø⇠⊗ C
		.. \\|/
		.. ● O
		.. }}}
		..
		.. Marker exist from:
		..
		.. * `A ø⇠○ B`
		.. * `A ø⇠○ C`
		.. * C (prune)
		..
		.. Command run:
		..
		.. * hg push -r O
		..
		.. Expected exchange:
		..
		.. * `A ø⇠○ C`
		.. * C (prune)
		..
		.. Expected exclude:
		..
		.. * `A ø⇠○ B`

		Setup
		-----

		$ . $TESTDIR/testlib/exchange-obsmarker-util.sh

		Implemented as the non-split version

		$ setuprepos C.4
		creating test repo for test case C.4
		- pulldest
		- main
		- pushdest
		cd into `main` and proceed with env setup
		$ cd main
		$ mkcommit A
		$ hg update -q 0
		$ mkcommit B
		created new head
		$ hg update -q 0
		$ mkcommit C
		created new head
		$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test case C-4 for obsolescence markers exchange...	r31968	$ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
Martin von Zweigbergk evolution: report new unstable changesets...	r35727	2 new content-divergent changesets
Pierre-Yves David obsolescence: add test case C-4 for obsolescence markers exchange...	r31968	$ hg prune -qd '0 0' .
		$ hg log -G --hidden
		x 7f7f229b13a6 (draft): C
		\|
		\| o 35b183996678 (draft): B
		\|/
		\| x f5bc6836db60 (draft): A
		\|/
		@ a9bdc8b26820 (public): O

		$ inspect_obsmarkers
		obsstore content
		================
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		$ cd ..
		$ cd ..

		Actual Test
		-----------

		$ dotest C.4 O
		## Running testcase C.4
		# testing echange of "O" (a9bdc8b26820)
		## initial state
		# obstore: main
		7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pushdest
		# obstore: pulldest
		## pushing "O" from main to pushdest
		pushing to pushdest
		searching for changes
		no changes found
		remote: 2 new obsolescence markers
		## post push state
		# obstore: main
		7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pushdest
		7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pulldest
		## pulling "a9bdc8b26820" from main into pulldest
		pulling from main
		no changes found
		2 new obsolescence markers
		## post pull state
		# obstore: main
		7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pushdest
		7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pulldest
		7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}