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

scmutil: make shortest() respect disambiguation revset...

scmutil: make shortest() respect disambiguation revset The previous patch would let you use a shorter prefix if the prefix is unique within a configured revset. However, that's not very useful if there's no simple way of knowing what that shorter prefix is. This patch adapts the shortest() template function to use the shorter prefixes for nodes in the configured revset. This is currently extremely slow, because it calculates the revset for each call to shortest(). To make this faster, the next patch will start caching the revset instance. Ideally we'd cache a prefix tree instance instead. Differential Revision: https://phab.mercurial-scm.org/D4038

Boris Feld - - Load All Authors

File last commit:

r33542:b11e8c67 default


                r38879:6f7c9527

default

Download file

             test-push-checkheads-superceed-A1.t
        
                    71 lines
            
             | 1.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A1.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r31974
            
      ====================================

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

      TestCase 1: single-changeset branch

      .. old-state:

      ..

      .. * 1 changeset branch

      ..

      .. new-state:

      ..

      .. * 1 changeset branch succeeding to A

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   A ø⇠◔ A'

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir A1

        $ cd A1

        $ 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)"`

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

              r33542
            
        obsoleted 1 changesets

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

              r31974
            
        $ hg log -G --hidden

        @  f6082bc4ffef (draft): A1

        |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

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

              r35394
            
        pushing to $TESTTMP/A1/server

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

              r31974
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

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

              r31974
            
        $ 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 for the "branch replacement" logic during push, case A1...	r31974	====================================
		Testing head checking code: Case A-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 A: simple case involving a branch being superceeded by another.
		TestCase 1: single-changeset branch

		.. old-state:
		..
		.. * 1 changeset branch
		..
		.. new-state:
		..
		.. * 1 changeset branch succeeding to A
		..
		.. expected-result:
		..
		.. * push allowed
		..
		.. graph-summary:
		..
		.. A ø⇠◔ A'
		.. \|/
		.. ●

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

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

		$ mkdir A1
		$ cd A1
		$ 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)"`
Boris Feld debugobsolete: also report the number of obsoleted changesets...	r33542	obsoleted 1 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A1...	r31974	$ hg log -G --hidden
		@ f6082bc4ffef (draft): A1
		\|
		\| x 8aaa48160adc (draft): A0
		\|/
		o 1e4be0697311 (public): root


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

		$ hg push
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pushing to $TESTTMP/A1/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A1...	r31974	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
		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 for the "branch replacement" logic during push, case A1...	r31974
		$ cd ../..