upstream/mercurial-mirror Files · tests/test-push-checkheads-pruned-B8.t

revset: use phasecache.getrevset to calculate public()...

revset: use phasecache.getrevset to calculate public() Other revsets like secret(), draft(), _nonpublic() are using phasescache.getrevset already. The latter is more efficient after D1606. So let's migrate the public() revset function too. Tested using: $ hg debugshell --hidden --cwd hg-committed` In [1]: %timeit len(repo.revs('public()')) * Before D1606: 10 loops, best of 3: 22.5 ms per loop * Before this change, after D1606: 10 loops, best of 3: 28.6 ms per loop * After this change: 10 loops, best of 3: 20.2 ms per loop Therefore `public()` revset becomes even slightly faster after the data structure change by D1606. A similar performance win could also be observed on a large repo. A side effect is `phasecache.getrevset` needs to take a `subset` parameter. That was added with a default value so it won't cause BC issues. Differential Revision: https://phab.mercurial-scm.org/D1620

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r35331:0c1aff6d

default

Download file

             test-push-checkheads-pruned-B8.t
        
                    104 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-pruned-B8.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      Testing head checking code: Case B-2

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

      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 B: simple case involving pruned changesets

      TestCase 2: multi-changeset branch, head is pruned, rest is superceeded, through other

      .. old-state:

      ..

      .. * 2 changeset branch

      ..

      .. new-state:

      ..

      .. * old head is rewritten then pruned

      .. * 1 new branch succeeding to the other changeset in the old branch (through another obsolete branch)

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   B ø⇠⊗ B'

      ..     | | A'

      ..   A ø⇠ø⇠◔ A''

      ..     |/ /

      ..     | /

      ..     |/

      ..     ●

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

      Test setup

      ----------

        $ mkdir B8

        $ cd B8

        $ 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/B8/server (glob)

        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 A1

        created new head

        $ mkcommit B1

        $ hg up 0

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

        $ mkcommit A2

        created new head

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

        obsoleted 1 changesets

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

        obsoleted 1 changesets

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

        obsoleted 1 changesets

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

        obsoleted 1 changesets

        $ hg log -G --hidden

        @  c1f8d089020f (draft): A2

        |

        | x  262c8c798096 (draft): B1

        | |

        | x  f6082bc4ffef (draft): A1

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | x  8aaa48160adc (draft): A0

        |/

        o  1e4be0697311 (public): root

      Actual testing

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

        $ hg push

        pushing to $TESTTMP/B8/server (glob)

        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        4 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 B-2
				====================================

				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 B: simple case involving pruned changesets
				TestCase 2: multi-changeset branch, head is pruned, rest is superceeded, through other

				.. old-state:
				..
				.. * 2 changeset branch
				..
				.. new-state:
				..
				.. * old head is rewritten then pruned
				.. * 1 new branch succeeding to the other changeset in the old branch (through another obsolete branch)
				..
				.. expected-result:
				..
				.. * push allowed
				..
				.. graph-summary:
				..
				.. B ø⇠⊗ B'
				.. \| \| A'
				.. A ø⇠ø⇠◔ A''
				.. \|/ /
				.. \| /
				.. \|/
				.. ●

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

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

				$ mkdir B8
				$ cd B8
				$ 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/B8/server (glob)
				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 A1
				created new head
				$ mkcommit B1
				$ hg up 0
				0 files updated, 0 files merged, 2 files removed, 0 files unresolved
				$ mkcommit A2
				created new head
				$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
				obsoleted 1 changesets
				$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
				obsoleted 1 changesets
				$ hg debugobsolete --record-parents `getid "desc(B1)"`
				obsoleted 1 changesets
				$ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
				obsoleted 1 changesets
				$ hg log -G --hidden
				@ c1f8d089020f (draft): A2
				\|
				\| x 262c8c798096 (draft): B1
				\| \|
				\| x f6082bc4ffef (draft): A1
				\|/
				\| x d73caddc5533 (draft): B0
				\| \|
				\| x 8aaa48160adc (draft): A0
				\|/
				o 1e4be0697311 (public): root


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

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

				$ cd ../..