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

copies: clean up _related logic...

copies: clean up _related logic The limit parameter was never actually used, since the only way the 4th case could be reached was if f1r and f2r converged. The new code makes this clear, and additionally reduces the conditional block to just 3 cases.

Martin von Zweigbergk - - Load All Authors

File last commit:

r35727:1a09dad8 default


                r37410:a4f02a17

default

Download file

             test-push-checkheads-superceed-A2.t
        
                    92 lines
            
             | 2.0 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A2.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r31975
            
      ====================================

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

      TestCase 2: multi-changeset branch

      .. old-state:

      ..

      .. * 1 branch with 2 changesets

      ..

      .. new-state:

      ..

      .. * another 2-changeset branch succeeding the old one

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   B ø⇠◔ B'

      ..     | |

      ..   A ø⇠◔ A'

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir A2

        $ cd A2

        $ 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/A2/server

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

              r31975
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

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

              r34662
            
        new changesets d73caddc5533

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

              r31975
            
        (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

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

              r31975
            
        $ 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 A2...

              r31975
            
        $ hg log -G --hidden

        @  262c8c798096 (draft): B1

        |

        o  f6082bc4ffef (draft): A1

        |

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

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

              r31975
            
        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 A2...

              r31975
            
        $ 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 A2...	r31975	====================================
		Testing head checking code: Case A-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 A: simple case involving a branch being superceeded by another.
		TestCase 2: multi-changeset branch

		.. old-state:
		..
		.. * 1 branch with 2 changesets
		..
		.. new-state:
		..
		.. * another 2-changeset branch succeeding the old one
		..
		.. expected-result:
		..
		.. * push allowed
		..
		.. graph-summary:
		..
		.. B ø⇠◔ B'
		.. \| \|
		.. A ø⇠◔ A'
		.. \|/
		.. ●

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

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

		$ mkdir A2
		$ cd A2
		$ 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/A2/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A2...	r31975	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets d73caddc5533
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A2...	r31975	(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
		$ 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 A2...	r31975	$ 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 A2...	r31975	$ hg log -G --hidden
		@ 262c8c798096 (draft): B1
		\|
		o f6082bc4ffef (draft): A1
		\|
		\| 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/A2/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A2...	r31975	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 A2...	r31975
		$ cd ../..