upstream/mercurial-mirror Files · tests/test-push-checkheads-partial-C4.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-partial-C4.t
        
                    85 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-partial-C4.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case C-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 C: case were the branch is only partially obsoleted

      TestCase 4: 2 changeset branch, only the base is pruned

      .. old-state:

      ..

      .. * 2 changeset branch

      ..

      .. new-state:

      ..

      .. * old base is pruned

      .. * 1 new unrelated branch

      ..

      .. expected-result:

      ..

      .. * push denied

      ..

      .. graph-summary:

      ..

      ..   B ◔

      ..     |

      ..   A ⊗ ◔ C

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir C4

        $ cd C4

        $ 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

        pulling from $TESTTMP/C4/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        new changesets d73caddc5533

        (run 'hg update' to get a working copy)

        $ hg up 0

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

        $ mkcommit C0

        created new head

        $ hg debugobsolete --record-parents `getid "desc(A0)"`

        obsoleted 1 changesets

        1 new orphan changesets

        $ hg log -G --hidden

        @  0f88766e02d6 (draft): C0

        |

        | *  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

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

        pushing to $TESTTMP/C4/server

        searching for changes

        abort: push creates new remote head 0f88766e02d6!

        (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

				====================================
				Testing head checking code: Case C-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 C: case were the branch is only partially obsoleted
				TestCase 4: 2 changeset branch, only the base is pruned

				.. old-state:
				..
				.. * 2 changeset branch
				..
				.. new-state:
				..
				.. * old base is pruned
				.. * 1 new unrelated branch
				..
				.. expected-result:
				..
				.. * push denied
				..
				.. graph-summary:
				..
				.. B ◔
				.. \|
				.. A ⊗ ◔ C
				.. \|/
				.. ●

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

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

				$ mkdir C4
				$ cd C4
				$ 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
				pulling from $TESTTMP/C4/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				new changesets d73caddc5533
				(run 'hg update' to get a working copy)
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit C0
				created new head
				$ hg debugobsolete --record-parents `getid "desc(A0)"`
				obsoleted 1 changesets
				1 new orphan changesets
				$ hg log -G --hidden
				@ 0f88766e02d6 (draft): C0
				\|
				\| * d73caddc5533 (draft): B0
				\| \|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push --rev 'desc(C0)'
				pushing to $TESTTMP/C4/server
				searching for changes
				abort: push creates new remote head 0f88766e02d6!
				(merge or see 'hg help push' for details about pushing new heads)
				[255]

				$ cd ../..