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

revsetlang: do not pass in non-bytes to parse()...

revsetlang: do not pass in non-bytes to parse() Since parse() isn't a simple function, we shouldn't expect it would raise TypeError or ValueError for invalid inputs. Before, TypeError was raised at 'if pos != len(spec)', which was quite late to report an error. This patch also makes tokenize() detect invalid object before converting it to a py3-safe bytes. Spotted while adding the 'revset(...)' hack to _parsewith().

Martin von Zweigbergk - - Load All Authors

File last commit:

r35727:1a09dad8 default


                r37793:03d7f885

default

Download file

             test-push-checkheads-unpushed-D3.t
        
                    114 lines
            
             | 2.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D3.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r32016
            
      ====================================

      Testing head checking code: Case D-3

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

      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 3: multi-changeset branch, split on multiple new others, only one of them is pushed

      .. old-state:

      ..

      .. * 2 changesets branch

      ..

      .. new-state:

      ..

      .. * 2 new branches, each superseding one changeset in the old one.

      ..

      .. expected-result:

      ..

      .. * pushing only one of the resulting branch (either of them)

      .. * push denied

      ..

      .. graph-summary:

      ..

      .. B'◔⇢ø B

      ..   | |

      .. A | ø⇠◔ A'

      ..   | |/

      ..    \|

      ..     ●

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

      Test setup

      ----------

        $ mkdir D3

        $ cd D3

        $ 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

        $ cd ../client

        $ hg pull

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

              r35394
            
        pulling from $TESTTMP/D3/server

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

              r32016
            
        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 D3...

              r32016
            
        (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 up '0'

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

        $ mkcommit B1

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

              r32016
            
        $ 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 D3...

              r32016
            
        $ hg log -G --hidden

        @  25c56d33e4c4 (draft): B1

        |

        | o  f6082bc4ffef (draft): A1

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

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

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

              r35394
            
        pushing to $TESTTMP/D3/server

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

              r32016
            
        searching for changes

        abort: push creates new remote head f6082bc4ffef!

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

        [255]

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

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

              r35394
            
        pushing to $TESTTMP/D3/server

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

              r32016
            
        searching for changes

        abort: push creates new remote head 25c56d33e4c4!

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

        [255]

      Extra testing

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

      In this case, even a bare push is creating more heads

        $ hg push

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

              r35394
            
        pushing to $TESTTMP/D3/server

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

              r32016
            
        searching for changes

        abort: push creates new remote head 25c56d33e4c4!

        (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 D3...	r32016	====================================
		Testing head checking code: Case D-3
		====================================

		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 3: multi-changeset branch, split on multiple new others, only one of them is pushed

		.. old-state:
		..
		.. * 2 changesets branch
		..
		.. new-state:
		..
		.. * 2 new branches, each superseding one changeset in the old one.
		..
		.. expected-result:
		..
		.. * pushing only one of the resulting branch (either of them)
		.. * push denied
		..
		.. graph-summary:
		..
		.. B'◔⇢ø B
		.. \| \|
		.. A \| ø⇠◔ A'
		.. \| \|/
		.. \\|
		.. ●

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

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

		$ mkdir D3
		$ cd D3
		$ 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
		$ cd ../client
		$ hg pull
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pulling from $TESTTMP/D3/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case D3...	r32016	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 D3...	r32016	(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 up '0'
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit B1
		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 D3...	r32016	$ 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 D3...	r32016	$ hg log -G --hidden
		@ 25c56d33e4c4 (draft): B1
		\|
		\| o f6082bc4ffef (draft): A1
		\|/
		\| x d73caddc5533 (draft): B0
		\| \|
		\| x 8aaa48160adc (draft): A0
		\|/
		o 1e4be0697311 (public): root


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

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

		Extra testing
		-------------

		In this case, even a bare push is creating more heads

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

		$ cd ../..