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

hgweb: render next pages on /graph incrementally...

hgweb: render next pages on /graph incrementally Previously, when user scrolled down to see the next page on /graph, all hgweb did was re-render everything that would be visible (by simply incrementing revcount). It was not efficient at all, and this patch makes /graph page behave similarly to the regular /log: every new page only consists of new changesets, no duplication, and only jsdata is based on the full set of changesets required to build accurate graph. This is achieved by adding "?graphtop=<node>" to the next page URL template, effectively remembering where the graph started, and using that value to create the new `tree` that covers the whole visible graph. That variable is then used to produce jsdata for redrawing graph client-side. nextentry is used for the same purpose as on /log page (to format the next page URL), but it's not a part of the graph.

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r35410:f84b0125

default

Download file

             test-push-checkheads-superceed-A7.t
        
                    102 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-push-checkheads-superceed-A7.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r31980
            
      ====================================

      Testing head checking code: Case A-7

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

      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 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head

      .. old-state:

      ..

      .. * 2 branch (1-changeset, and 2-changesets)

      ..

      .. new-state:

      ..

      .. * 1 new branch superceeding the head of the old-2-changesets-branch,

      .. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other

      ..

      .. expected-result:

      ..

      .. * push allowed

      ..

      .. graph-summary:

      ..

      ..   B ø⇠◔ B'

      ..     | |

      .. A'◔⇢ø |

      ..   | |/

      .. C ● |

      ..    \|

      ..     ●

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

      Test setup

      ----------

        $ mkdir A7

        $ cd A7

        $ 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

        $ hg up 0

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

        $ mkcommit C0

        created new head

        $ cd ../client

        $ hg pull

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

              r35394
            
        pulling from $TESTTMP/A7/server

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

              r31980
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        Denis Laxalde
    
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...

              r34662
            
        new changesets d73caddc5533:0f88766e02d6

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

              r31980
            
        (run 'hg heads' to see heads, 'hg merge' to merge)

        $ hg up 'desc(C0)'

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

        $ mkcommit A1

        $ hg up 0

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

        $ mkcommit B1

        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 A7...

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

        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 A7...

              r31980
            
        $ hg log -G --hidden

        @  25c56d33e4c4 (draft): B1

        |

        | o  a0802eb7fc1b (draft): A1

        | |

        | o  0f88766e02d6 (draft): C0

        |/

        | x  d73caddc5533 (draft): B0

        | |

        | 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/A7/server

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

              r31980
            
        searching for changes

        adding changesets

        adding manifests

        adding file changes

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

        2 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        obsoleted 2 changesets

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

              r31980
            
        $ 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 A7...	r31980	====================================
		Testing head checking code: Case A-7
		====================================

		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 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head

		.. old-state:
		..
		.. * 2 branch (1-changeset, and 2-changesets)
		..
		.. new-state:
		..
		.. * 1 new branch superceeding the head of the old-2-changesets-branch,
		.. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other
		..
		.. expected-result:
		..
		.. * push allowed
		..
		.. graph-summary:
		..
		.. B ø⇠◔ B'
		.. \| \|
		.. A'◔⇢ø \|
		.. \| \|/
		.. C ● \|
		.. \\|
		.. ●

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

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

		$ mkdir A7
		$ cd A7
		$ 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
		$ hg up 0
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ mkcommit C0
		created new head
		$ cd ../client
		$ hg pull
Matt Harbison tests: remove (glob) annotations that were only for '\' matches...	r35394	pulling from $TESTTMP/A7/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files (+1 heads)
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets d73caddc5533:0f88766e02d6
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	(run 'hg heads' to see heads, 'hg merge' to merge)
		$ hg up 'desc(C0)'
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkcommit A1
		$ hg up 0
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ mkcommit B1
		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 A7...	r31980	$ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
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 A7...	r31980	$ hg log -G --hidden
		@ 25c56d33e4c4 (draft): B1
		\|
		\| o a0802eb7fc1b (draft): A1
		\| \|
		\| o 0f88766e02d6 (draft): C0
		\|/
		\| x d73caddc5533 (draft): B0
		\| \|
		\| 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/A7/server
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 2 files (+1 heads)
		2 new obsolescence markers
marmoute obsolete: reports the number of local changeset obsoleted when unbundling...	r33249	obsoleted 2 changesets
Pierre-Yves David obsolescence: add test for the "branch replacement" logic during push, case A7...	r31980
		$ cd ../..