upstream/mercurial-mirror Files · tests/test-push-checkheads-superceed-A4.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().

Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default


                r37793:03d7f885

default

Download file

             test-push-checkheads-superceed-A4.t
        
                    76 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A4.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case A-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 A: simple case involving a branch being superceeded by another.

      TestCase 4: New changeset as children of the successor

      .. old-state:

      ..

      .. * 1-changeset branch

      ..

      .. new-state:

      ..

      .. * 2-changeset branch, first is a successor, but head is new

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..       ◔ B

      ..       |

      ..   A ø⇠◔ A'

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir A4

        $ cd A4

        $ 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

        $ mkcommit B0

        $ hg log -G --hidden

        @  f40ded968333 (draft): B0

        |

        o  f6082bc4ffef (draft): A1

        |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

        pushing to $TESTTMP/A4/server

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        1 new obsolescence markers

        obsoleted 1 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-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 A: simple case involving a branch being superceeded by another.
				TestCase 4: New changeset as children of the successor

				.. old-state:
				..
				.. * 1-changeset branch
				..
				.. new-state:
				..
				.. * 2-changeset branch, first is a successor, but head is new
				..
				.. expected-result:
				..
				.. * push allowed
				..
				.. graph-summary:
				..
				.. ◔ B
				.. \|
				.. A ø⇠◔ A'
				.. \|/
				.. ●

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

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

				$ mkdir A4
				$ cd A4
				$ 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
				$ mkcommit B0
				$ hg log -G --hidden
				@ f40ded968333 (draft): B0
				\|
				o f6082bc4ffef (draft): A1
				\|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

				$ hg push
				pushing to $TESTTMP/A4/server
				searching for changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 2 files (+1 heads)
				1 new obsolescence markers
				obsoleted 1 changesets

				$ cd ../../