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

context: stop catching RepoLookupError from namespace.singlenode()...

context: stop catching RepoLookupError from namespace.singlenode() As pointed out by Yuya, the RepoLookupError was there for catching errors from repo.branchtip(). However, since (localrepo: add ignoremissing parameter to branchtip, 2014-10-16), that should no longer happen. I think it should now be an error if a namespace raises a RepoLookupError, so we propagate the exception up and and make it easy to fix, rather than trying to interpret the changeid as nodeid prefix and raise a general "unknown revision '...'" error. I also don't think we should catch FilteredLookupError and LookupError from the changelog.rev() call, for the same reason as above: If a namespace returns a node that doesn't exist, we should provide a more helpful exception than "unknown revision '...'". Differential Revision: https://phab.mercurial-scm.org/D3145

Martin von Zweigbergk - - Load All Authors

File last commit:

r35727:1a09dad8 default


                r37409:3198d5a2

default

Download file

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

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

      Testing head checking code: Case A-7

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

      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 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head

      .. old-state:

      ..

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

      ..

      .. new-state:

      ..

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

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

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   B ø⇠◔ B'

      ..     | |

      .. A'◔⇢ø |

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

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

      Test setup

      ----------

        $ mkdir A7

        $ cd A7

        $ 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

        pulling from $TESTTMP/A7/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        new changesets d73caddc5533:0f88766e02d6

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

        $ hg up 'desc(C0)'

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

        $ mkcommit A1

        $ hg up 0

        0 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ mkcommit B1

        created new head

        $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`

        obsoleted 1 changesets

        1 new orphan changesets

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

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  25c56d33e4c4 (draft): B1

        |

        | o  a0802eb7fc1b (draft): A1

        | |

        | o  0f88766e02d6 (draft): C0

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

        pushing to $TESTTMP/A7/server

        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

        obsoleted 2 changesets

        $ 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

				====================================
				Testing head checking code: Case A-7
				====================================

				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 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head

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

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

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

				$ mkdir A7
				$ cd A7
				$ 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
				pulling from $TESTTMP/A7/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files (+1 heads)
				new changesets d73caddc5533:0f88766e02d6
				(run 'hg heads' to see heads, 'hg merge' to merge)
				$ hg up 'desc(C0)'
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit A1
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit B1
				created new head
				$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
				obsoleted 1 changesets
				1 new orphan changesets
				$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
				obsoleted 1 changesets
				$ hg log -G --hidden
				@ 25c56d33e4c4 (draft): B1
				\|
				\| o a0802eb7fc1b (draft): A1
				\| \|
				\| o 0f88766e02d6 (draft): C0
				\|/
				\| x d73caddc5533 (draft): B0
				\| \|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push
				pushing to $TESTTMP/A7/server
				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
				obsoleted 2 changesets

				$ cd ../..