upstream/mercurial-mirror Files · tests/test-exchange-obsmarkers-case-A5.t

hgweb: support constructing URLs from an alternate base URL...

hgweb: support constructing URLs from an alternate base URL The web.baseurl config option allows server operators to define a custom URL for hosted content. The way it works today is that hgwebdir parses this config option into URL components then updates the appropriate WSGI environment variables so the request "lies" about its details. For example, SERVER_NAME is updated to reflect the alternate base URL's hostname. The WSGI environment should not be modified because WSGI applications may want to know the original request details (for debugging, etc). This commit teaches our request parser about the existence of an alternate base URL. If defined, the advertised URL and other self-reflected paths will take the alternate base URL into account. The hgweb WSGI application didn't use web.baseurl. But hgwebdir did. We update hgwebdir to alter the environment parsing accordingly. The old code around environment manipulation has been removed. With this change, parserequestfromenv() has grown to a bit unwieldy. Now that practically everyone is using it, it is obvious that there is some unused features that can be trimmed. So look for this in follow-up commits. Differential Revision: https://phab.mercurial-scm.org/D2822

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r36916:219b2335

default

Download file

             test-exchange-obsmarkers-case-A5.t
        
                    139 lines
            
             | 4.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-exchange-obsmarkers-case-A5.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pierre-Yves David
    
obsolescence: add test case A-5 for obsolescence markers exchange...

              r31910
            
      ============================================

      Testing obsolescence markers push: Cases A.5

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

      Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of

      all changesets that requested to be "in sync" after the push (even if they are

      already on both side).

      This test belongs to a series of tests checking such set is properly computed

      and applied. This does not tests "obsmarkers" discovery capabilities.

      Category A: simple cases

      TestCase 5: partial reordering

      A.5 partial reordering

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

      ..

      .. {{{

      ..   B ø⇠⇠

      ..     | ⇡

      ..   A ø⇠⇠⇠○ A'

      ..     | ⇡/

      ..     | ○ B'

      ..     |/

      ..     ● O

      .. }}}

      ..

      .. Marker exist from:

      ..

      ..  * `Aø⇠○ A'`

      ..  * `Bø⇠○ B'`

      ..

      .. Command run:

      ..

      ..  * hg push -r B

      ..

      .. Expected exchange:

      ..

      ..  * `Bø⇠○ B'`

      ..

      .. Expected Exclude:

      ..

      ..  * `Aø⇠○ A'`

      Setup

      -----

        $ . $TESTDIR/testlib/exchange-obsmarker-util.sh

      initial

        $ setuprepos A.5

        creating test repo for test case A.5

        - pulldest

        - main

        - pushdest

        cd into `main` and proceed with env setup

        $ cd main

        $ mkcommit A0

        $ mkcommit B0

        $ hg update 0

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

        $ mkcommit B1

        created new head

        $ mkcommit A1

        $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`

        $ 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 case A-5 for obsolescence markers exchange...

              r31910
            
        $ 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 case A-5 for obsolescence markers exchange...

              r31910
            
        $ hg log -G --hidden

        @  8c0a98c83722 (draft): A1

        |

        o  f6298a8ac3a4 (draft): B1

        |

        | x  6e72f0a95b5e (draft): B0

        | |

        | x  28b51eb45704 (draft): A0

        |/

        o  a9bdc8b26820 (public): O

        $ inspect_obsmarkers

        obsstore content

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

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        $ cd ..

        $ cd ..

      Actual Test

      -----------

        $ dotest A.5 B1

        ## Running testcase A.5

        # testing echange of "B1" (f6298a8ac3a4)

        ## initial state

        # obstore: main

        28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        # obstore: pulldest

        ## pushing "B1" from main to pushdest

        pushing to pushdest

        searching for changes

        remote: adding changesets

        remote: adding manifests

        remote: adding file changes

        remote: added 1 changesets with 1 changes to 1 files

        remote: 1 new obsolescence markers

        ## post push state

        # obstore: main

        28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pulldest

        ## pulling "f6298a8ac3a4" from main into pulldest

        pulling from main

        searching for changes

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        1 new obsolescence markers

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

              r34662
            
        new changesets f6298a8ac3a4

        Pierre-Yves David
    
obsolescence: add test case A-5 for obsolescence markers exchange...

              r31910
            
        (run 'hg update' to get a working copy)

        ## post pull state

        # obstore: main

        28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pushdest

        6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # obstore: pulldest

        6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

	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 case A-5 for obsolescence markers exchange...	r31910	============================================
		Testing obsolescence markers push: Cases A.5
		============================================

		Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
		all changesets that requested to be "in sync" after the push (even if they are
		already on both side).

		This test belongs to a series of tests checking such set is properly computed
		and applied. This does not tests "obsmarkers" discovery capabilities.

		Category A: simple cases
		TestCase 5: partial reordering

		A.5 partial reordering
		======================

		..
		.. {{{
		.. B ø⇠⇠
		.. \| ⇡
		.. A ø⇠⇠⇠○ A'
		.. \| ⇡/
		.. \| ○ B'
		.. \|/
		.. ● O
		.. }}}
		..
		.. Marker exist from:
		..
		.. * `Aø⇠○ A'`
		.. * `Bø⇠○ B'`
		..
		.. Command run:
		..
		.. * hg push -r B
		..
		.. Expected exchange:
		..
		.. * `Bø⇠○ B'`
		..
		.. Expected Exclude:
		..
		.. * `Aø⇠○ A'`

		Setup
		-----

		$ . $TESTDIR/testlib/exchange-obsmarker-util.sh

		initial

		$ setuprepos A.5
		creating test repo for test case A.5
		- pulldest
		- main
		- pushdest
		cd into `main` and proceed with env setup
		$ cd main
		$ mkcommit A0
		$ mkcommit B0
		$ hg update 0
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ mkcommit B1
		created new head
		$ mkcommit A1
		$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
		$ 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 case A-5 for obsolescence markers exchange...	r31910	$ 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 case A-5 for obsolescence markers exchange...	r31910	$ hg log -G --hidden
		@ 8c0a98c83722 (draft): A1
		\|
		o f6298a8ac3a4 (draft): B1
		\|
		\| x 6e72f0a95b5e (draft): B0
		\| \|
		\| x 28b51eb45704 (draft): A0
		\|/
		o a9bdc8b26820 (public): O

		$ inspect_obsmarkers
		obsstore content
		================
		aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		$ cd ..
		$ cd ..

		Actual Test
		-----------

		$ dotest A.5 B1
		## Running testcase A.5
		# testing echange of "B1" (f6298a8ac3a4)
		## initial state
		# obstore: main
		28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pushdest
		# obstore: pulldest
		## pushing "B1" from main to pushdest
		pushing to pushdest
		searching for changes
		remote: adding changesets
		remote: adding manifests
		remote: adding file changes
		remote: added 1 changesets with 1 changes to 1 files
		remote: 1 new obsolescence markers
		## post push state
		# obstore: main
		28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pushdest
		6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pulldest
		## pulling "f6298a8ac3a4" from main into pulldest
		pulling from main
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files
		1 new obsolescence markers
Denis Laxalde transaction-summary: show the range of new revisions upon pull/unbundle (BC)...	r34662	new changesets f6298a8ac3a4
Pierre-Yves David obsolescence: add test case A-5 for obsolescence markers exchange...	r31910	(run 'hg update' to get a working copy)
		## post pull state
		# obstore: main
		28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pushdest
		6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
		# obstore: pulldest
		6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}