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

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

av6 - - Load All Authors

File last commit:

r50061:5996640f default


                r53438:f33f37ac

default

Download file

             test-push-checkheads-unpushed-D4.t
        
                    129 lines
            
             | 3.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D4.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r31988
            
      ====================================

      Testing head checking code: Case D-4

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

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

      .. old-state:

      ..

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

      ..

      .. new-state:

      ..

        av6
    
tests: fix misspelling of supersede...

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

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

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

              r31988
            
      ..

      .. expected-result:

      ..

      .. * push the new branch only -> push denied (variant a)

      .. * push the existing branch only -> push allowed (variant b)

      .. (pushing all is tested as case A-7)

      ..

      .. graph-summary:

      ..

      .. (variant a)

      ..

      .. B'○⇢ø B

      ..   | |

      .. A | ø⇠◔ A'

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

      ..

      .. or (variant b)

      ..

      .. B'◔⇢ø B

      ..   | |

      .. A | ø⇠○ A'

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

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

      Test setup

      ----------

        $ mkdir D4

        $ cd D4

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

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

              r31988
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        Boris Feld
    
phase: report number of non-public changeset alongside the new range...

              r39516
            
        new changesets d73caddc5533:0f88766e02d6 (2 drafts)

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

              r31988
            
        (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)"`

        marmoute
    
debugobsolete: also issue the "new obsmarkers" messsage...

              r43163
            
        1 new obsolescence markers

        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 dor the "branch replacement" logic during push, case D4...

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

        marmoute
    
debugobsolete: also issue the "new obsmarkers" messsage...

              r43163
            
        1 new obsolescence markers

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

              r33542
            
        obsoleted 1 changesets

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

              r31988
            
        $ 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 (new branch only)

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

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

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

              r35394
            
        pushing to $TESTTMP/D4/server

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

              r31988
            
        searching for changes

        Martin von Zweigbergk
    
errors: remove trailing "!" in messages about creating new heads on push...

              r46520
            
        abort: push creates new remote head f6082bc4ffef

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

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

        Martin von Zweigbergk
    
errors: raise StateError when push fails because it creates new heads...

              r46735
            
        [20]

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

              r31988
            
      Actual testing (existing branch only)

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

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

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

              r35394
            
        pushing to $TESTTMP/D4/server

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

              r31988
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        1 new obsolescence markers

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

              r33249
            
        obsoleted 1 changesets

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

              r31988
            
        $ 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 dor the "branch replacement" logic during push, case D4...	r31988	====================================
		Testing head checking code: Case D-4
		====================================

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

		.. old-state:
		..
		.. * 2 branch (1 changeset, and 2 changesets)
		..
		.. new-state:
		..
av6 tests: fix misspelling of supersede...	r50061	.. * 1 new branch superseding the base of the old-2-changesets-branch,
		.. * 1 new changesets on the old-1-changeset-branch superseding the head of the other
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988	..
		.. expected-result:
		..
		.. * push the new branch only -> push denied (variant a)
		.. * push the existing branch only -> push allowed (variant b)
		.. (pushing all is tested as case A-7)
		..
		.. graph-summary:
		..
		.. (variant a)
		..
		.. B'○⇢ø B
		.. \| \|
		.. A \| ø⇠◔ A'
		.. \| \|/
		.. C ● \|
		.. \\|
		.. ●
		..
		.. or (variant b)
		..
		.. B'◔⇢ø B
		.. \| \|
		.. A \| ø⇠○ A'
		.. \| \|/
		.. C ● \|
		.. \\|
		.. ●

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

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

		$ mkdir D4
		$ cd D4
		$ 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/D4/server
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files (+1 heads)
Boris Feld phase: report number of non-public changeset alongside the new range...	r39516	new changesets d73caddc5533:0f88766e02d6 (2 drafts)
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988	(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)"`
marmoute debugobsolete: also issue the "new obsmarkers" messsage...	r43163	1 new obsolescence markers
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 dor the "branch replacement" logic during push, case D4...	r31988	$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
marmoute debugobsolete: also issue the "new obsmarkers" messsage...	r43163	1 new obsolescence markers
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988	$ 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 (new branch only)
		--------------------------------

		$ hg push --rev 'desc(A1)'
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pushing to $TESTTMP/D4/server
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988	searching for changes
Martin von Zweigbergk errors: remove trailing "!" in messages about creating new heads on push...	r46520	abort: push creates new remote head f6082bc4ffef
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988	(merge or see 'hg help push' for details about pushing new heads)
Martin von Zweigbergk errors: raise StateError when push fails because it creates new heads...	r46735	[20]
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988
		Actual testing (existing branch only)
		------------------------------------

		$ hg push --rev 'desc(B1)'
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pushing to $TESTTMP/D4/server
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		1 new obsolescence markers
marmoute obsolete: reports the number of local changeset obsoleted when unbundling...	r33249	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test dor the "branch replacement" logic during push, case D4...	r31988
		$ cd ../..