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

tests: drop files from exclusion list in test-check-module-imports.t...

tests: drop files from exclusion list in test-check-module-imports.t Now, these files has no style issue at checking with import-checker.py. BTW, tests/test-imports-checker.t is still excluded, because almost all code fragments in it has intentional importing style violation. Using NO_CHECK_EOF instead of EOF as heredoc limit mark can make import-checker.py ignore such fragments. But keeping these fragments checkable seems still useful: for example, test-imports-checker.t can be used to test whether import-checker.py can detect erroneous code fragment in test script as expected.

Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default


                r40243:f9e3044d

default

Download file

             test-push-checkheads-unpushed-D1.t
        
                    78 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-unpushed-D1.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case D-1

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

      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 1: remote head is rewritten, but successors is not part of the push

      .. old-state:

      ..

      .. * 1 changeset branch

      ..

      .. new-state:

      ..

      .. * 1 changeset branch succeeding the old branch

      .. * 1 new unrelated branch

      ..

      .. expected-result:

      ..

      .. * pushing only the unrelated branch: denied

      ..

      .. graph-summary:

      ..

      ..   A ø⇠○ A'

      ..     |/

      ..     | ◔ B

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir D1

        $ cd D1

        $ setuprepos

        creating basic server and client repo

        updating to branch default

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

        $ cd client

        $ hg up 0

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

        $ mkcommit A1

        created new head

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

        obsoleted 1 changesets

        $ hg up 0

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

        $ mkcommit B0

        created new head

        $ hg log -G --hidden

        @  74ff5441d343 (draft): B0

        |

        | o  f6082bc4ffef (draft): A1

        |/

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push -r 'desc(B0)'

        pushing to $TESTTMP/D1/server

        searching for changes

        abort: push creates new remote head 74ff5441d343!

        (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 D-1
				====================================

				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 1: remote head is rewritten, but successors is not part of the push

				.. old-state:
				..
				.. * 1 changeset branch
				..
				.. new-state:
				..
				.. * 1 changeset branch succeeding the old branch
				.. * 1 new unrelated branch
				..
				.. expected-result:
				..
				.. * pushing only the unrelated branch: denied
				..
				.. graph-summary:
				..
				.. A ø⇠○ A'
				.. \|/
				.. \| ◔ B
				.. \|/
				.. ●

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

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

				$ mkdir D1
				$ cd D1
				$ setuprepos
				creating basic server and client repo
				updating to branch default
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd client
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit A1
				created new head
				$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
				obsoleted 1 changesets
				$ hg up 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mkcommit B0
				created new head
				$ hg log -G --hidden
				@ 74ff5441d343 (draft): B0
				\|
				\| o f6082bc4ffef (draft): A1
				\|/
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push -r 'desc(B0)'
				pushing to $TESTTMP/D1/server
				searching for changes
				abort: push creates new remote head 74ff5441d343!
				(merge or see 'hg help push' for details about pushing new heads)
				[255]

				$ cd ../..